页面调整

app/Http/Services/DataService.php

@@ -493,6 +493,31 @@ class DataService
             });
             });
         })->export('csv');
         })->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/Validators/SupplierValidator.php

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

app/Http/routes.php

@@ -54,5 +54,5 @@ Route::group(['middleware' => ['external'],'namespace' => 'Api'], function () {
 });
 });
 
 
 Route::match(['get', 'post'], '/test', function () {
 Route::match(['get', 'post'], '/test', function () {
-    (new \App\Http\Services\DataService())->exportSupplierForUnionData();
+    (new \App\Http\Services\DataService())->exportSupplierJsonForUnited();
 });
 });

config/fixed.php

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

resources/views/web/PrintSupplier.blade.php

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