修复冲突

app/Http/Services/DataService.php

@@ -518,5 +518,30 @@ class DataService
             });
         })->export('csv');
     }
+
+    public function exportSupplierJsonForUnited()
+    {
+        $suppliers = SupplierChannelModel::where('is_type', 0)
+            ->pluck('supplier_group', 'supplier_id')->toArray();
+        $exportJson = [];
+        $items = array_map(function ($value) {
+            $value = array_get(config('fixed.SupplierGroup'), $value);
+            return $value;
+        }, $suppliers);
+        $jsonItems = [];
+        foreach ($items as $key => $item) {
+            $jsonItems[] = [
+                'i' => $key,
+                'n' => $item
+            ];
+        }
+        $exportJson = [
+            'sysId' => 1,
+            'cType' => 2,
+            'list' => $jsonItems,
+        ];
+
+        echo json_encode($exportJson);
+    }
 }
 

app/Http/Services/SkuService.php

@@ -99,6 +99,7 @@ class SkuService
                 $item['encoded_user_name'] = array_get($encodedUsers, $encoded, '');
                 $item['moq'] = $item['moq'] ?: 0;
                 $item['stock'] = $item['stock'] ?: 0;
+                $item['cp_time'] = $item['cp_time'] ? date('Y-m-d H:i:s', $item['cp_time']) : '';
                 return $item;
             }, $list);
         }

app/Http/Validators/SupplierValidator.php

@@ -57,6 +57,7 @@ class SupplierValidator
             'main_brands' => 'required',
             'pay_type' => 'required',
             'settlement_type' => 'required',
+            'established_time' => 'required',
             'currency' => 'required',
             'supplier_group' => 'required',
             'main_customers' => 'max:100',

config/fixed.php

@@ -86,6 +86,7 @@ return [
         //账期-定期结算
         2 => '货到付款',
 //        4 => '定金'
+        5 => '验货付款',
     ],
 
     'SupplierApiType' => [

resources/views/script/SkuListScript.blade.php

@@ -38,11 +38,13 @@
         @if (request()->get('search')==1)
         setTimeout(function () {
             $('#getSupplierListButton').click();
-        },500);
+        }, 500);
         @endif
 
         let cols = [
             {type: 'checkbox'},
+            {field: 'cp_time', title: '上架有效期', align: 'center', width: 180},
+
             {
                 field: 'goods_name', title: '型号', align: 'center', width: 200, templet: function (data) {
                     return "<a href='{{config('website.FootstoneUrl')}}/footstone/addsku?sku_id=" + data.goods_id + "' style='color:blue' target='_blank'>"

resources/views/web/AddSupplier.blade.php

@@ -162,7 +162,7 @@
                     {!! $singleSelectPresenter->render('has_legal_ID_card','法人身份证 :',-1,[1=>'有',-1=>'无']) !!}
                 </div>
                 <div class="layui-col-md3">
-                    <label class="layui-form-label" style="width: 80px">成立时间 :
+                    <label class="layui-form-label" style="width: 80px"><span class="require">*</span>成立时间 :
                     </label>
                     <div class="layui-input-block" style="width: 150px">
                         <input type="text" id="established_time" name="established_time"

resources/views/web/PrintSupplier.blade.php

@@ -74,7 +74,7 @@
                     style="text-align: left;padding-left: 20px">{{$printData['supplier_address']}}</td>
             </tr>
             <tr>
-                <td width="20%" colspan="1">供应商办公/发货地址*</td>
+                <td width="20%" colspan="1">供应商办公/发货地址</td>
                 <td width="80%" colspan="5"
                     style="text-align: left;padding-left: 20px">{{$printData['shipping_address']}}</td>
             </tr>
@@ -132,7 +132,7 @@
                 <td width="80%" colspan="5" style="text-align: left;padding-left: 20px"></td>
             </tr>
             <tr>
-                <td width="20%" colspan="1">供应商到票时间*</td>
+                <td width="20%" colspan="1">供应商到票时间</td>
                 <td width="80%" colspan="5"
                     style="text-align: left;padding-left: 20px">{{$printData['ticket_time'] or ''}}</td>
             </tr>

resources/views/web/SupplierDetail.blade.php

@@ -164,7 +164,7 @@
                                     ：{{$supplier['has_legal_ID_card_name']}}
                                 </div>
                                 <div class="layui-col-md3">
-                                    成立时间 ：{{$supplier['established_time']}}
+                                    <span class="required_field">*</span> 成立时间 ：{{$supplier['established_time']}}
                                 </div>
                             </div>
                             <div class="layui-row">

resources/views/web/supplier/SupplierBase.blade.php

@@ -167,7 +167,7 @@
                     {!! $singleSelectPresenter->render('has_legal_ID_card','法人身份证 :',$supplier['has_legal_ID_card'],[1=>'有',-1=>'无']) !!}
                 </div>
                 <div class="layui-col-md3">
-                    <label class="layui-form-label" style="width: 80px">成立时间 :
+                    <label class="layui-form-label" style="width: 80px"><span class="require">*</span>成立时间 :
                     </label>
                     <div class="layui-input-block" style="width: 150px">
                         <input type="text" id="established_time" name="established_time"