Merge remote-tracking branch 'origin/master'

app/Admin/Controllers/Api/OrderApiController.php

@@ -10,15 +10,29 @@ use Maatwebsite\Excel\Facades\Excel;
 class OrderApiController extends Controller
 class OrderApiController extends Controller
 {
 {
     
     
-    public function orderDownloadShow(){
-        $this->view();
+    public function orderDownloadShow(Request $request){
+        $params = $request->all();
+        $type = arrayGet($params, "type");
+        if($type == "1"){
+            //PI
+
+
+
+
+            return view('export.order_contract_PI');
+        }elseif($type == "2"){
+            //CI
+            return view('export.order_contract_CI');
+        }else{
+            //PL
+            return view('export.order_contract_PL');
+        }
+
     }
     }
     
     
     
     
     public function orderDownload(Request $request){
     public function orderDownload(Request $request){
         $params = $request->all();
         $params = $request->all();
-//        dd($params);
-
         return Excel::download(new \App\Exports\ContractExport(),'PI.xlsx');
         return Excel::download(new \App\Exports\ContractExport(),'PI.xlsx');
     }
     }
 }
 }

app/Admin/Controllers/CountryController.php

+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\Country;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class CountryController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new Country(), function (Grid $grid) {
+
+            $grid->showFilter();
+            $grid->disableActions();
+            $grid->disableCreateButton();
+            $grid->filter(function ($filter) {
+                $filter->expand(true);
+                $filter->like('name')->width(3);
+            });
+            $grid->column('id')->sortable();
+            $grid->column('name')->editable();
+            $grid->column('capital');
+            $grid->column('currency');
+            $grid->column('currency_name');
+            $grid->column('currency_symbol');
+            $grid->column('region');
+            $grid->column('subregion');
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new Country(), function (Show $show) {
+            $show->field('id');
+            $show->field('name');
+            $show->field('capital');
+            $show->field('currency');
+            $show->field('currency_name');
+            $show->field('currency_symbol');
+            $show->field('region');
+            $show->field('subregion');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new Country(), function (Form $form) {
+            $form->display('id');
+            $form->text('name');
+            $form->text('capital');
+            $form->text('currency');
+            $form->text('currency_name');
+            $form->text('currency_symbol');
+            $form->text('region');
+            $form->text('subregion');
+        });
+    }
+}

app/Admin/Extensions/InvalidRequestException.php

+<?php
+
+namespace App\Exceptions;
+
+use App\Http\ApiHelper\Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+/*
+ *无效请求异常
+ */
+
+class InvalidRequestException extends \Exception
+{
+
+    public function __construct($message = "", $code = 200)
+    {
+        parent::__construct($message, $code);
+    }
+
+    public function render(Request $request)
+    {
+        $request_uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
+        $path_info = parse_url($request_uri);
+        $err_info = [
+            'domain' => isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '',
+            'interface' => isset($path_info) ? $path_info['path'] : '',
+            'user_agent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '',
+            'ip' => request()->getClientIp(),
+            'time' => time(),
+            'other' => '',
+            'request_params' => $_REQUEST,
+            'msg' => $this->getMessage(),
+            "code" => $this->getCode(),
+        ];
+        Log::error(json_encode($err_info, JSON_UNESCAPED_UNICODE));
+        return response()->json(json_decode(Response::setError($this->message), true));
+    }
+}

app/Admin/Extensions/Show/Textarea.php

@@ -20,6 +20,6 @@ JS
         );
         );
         // 返回任意可被渲染的内容
         // 返回任意可被渲染的内容
 
 
-        return "<div class='box box-solid box-default no-margin box-show custom-textarea'><div class='box-body'  style='min-height: 150px;'>$this->value</div></div>";
+        return "<div class='box box-solid box-default no-margin box-show custom-textarea'><div class='box-body'  style='min-height: 120px;'>$this->value</div></div>";
     }
     }
 }
 }

app/Admin/Repositories/Country.php

+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\Country as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class Country extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/Admin/Service/OrderService.php

+<?php
+
+namespace App\Admin\Service;
+
+use App\Models\Cms\CmsUser;
+use App\Models\Order;
+use Dcat\Admin\Grid;
+
+class OrderService
+{
+
+    public static function getOrderList($orderId=0){
+    }
+
+
+}

app/Admin/routes.php

@@ -20,8 +20,10 @@ Route::group([
     $router->resource('order', 'OrderController');
     $router->resource('order', 'OrderController');
     $router->resource('test', 'TestController');
     $router->resource('test', 'TestController');
     $router->resource('users', 'UserController');
     $router->resource('users', 'UserController');
+    $router->resource('country', 'CountryController');
     //下载pdf
     //下载pdf
     Route::get('/api/order_download', '\App\Admin\Controllers\Api\OrderApiController@orderDownload');
     Route::get('/api/order_download', '\App\Admin\Controllers\Api\OrderApiController@orderDownload');
+    Route::get('/api/orderDownloadShow', '\App\Admin\Controllers\Api\OrderApiController@orderDownloadShow');
 });
 });
 
 
 
 

app/Models/Country.php

+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Country extends Model
+{
+    //
+    protected $table = 'country';
+    public $timestamps = false;
+}

app/helpers.php

@@ -2,6 +2,10 @@
 
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Arr;
 
 
+define("DIGITS_TWO",2);
+define("DIGITS_FOUR",4);
+define("DIGITS_SIX",6);
+
 if (! function_exists('user_admin_config')) {
 if (! function_exists('user_admin_config')) {
     function user_admin_config($key = null, $value = null)
     function user_admin_config($key = null, $value = null)
     {
     {
@@ -76,3 +80,341 @@ function curl($url, $params = false, $ispost = 0, $https = 0, $cookie = '', $tim
     curl_close($ch);
     curl_close($ch);
     return $response;
     return $response;
 }
 }
+
+
+/**
+ * 通用格式化字符串为数字金额
+ * @$amount   需要格式化的数字或者字符串 1.2345
+ * @$digits  保留小数位数   1.23
+ * @$currency  币别 ￥12003.4567
+ * @$thousandsSymbol 千分位字符串隔开  1,200,3.4567
+ *
+ *  define("DIGITS_TWO",2);
+define("DIGITS_FOUR",4);
+define("DIGITS_SIX",6);
+ */
+if (!function_exists('decimal_number_format')) {
+    function decimal_number_format($amount,$digits=DIGITS_TWO,$currency="",$thousandsSymbol=""){
+        $amount = floatval(strval($amount));
+        //格式化币别
+        if($currency){
+            $minus = $amount < 0 ? '-' : '';
+            $numerical = number_format(abs($amount),$digits,".",$thousandsSymbol);
+            $sign = \Arr::get(config("field.currency_sign"),intval($currency),"");
+            if (!empty($sign)) {
+                $numerical = $sign . $numerical;
+            }
+            return $minus ? $minus.$numerical : $numerical;
+        }else{
+            $numerical = number_format($amount,$digits,".","");
+            return $numerical;
+        }
+    }
+}
+
+if (!function_exists('printJson')) {
+    function printJson($data)
+    {
+        print_r(is_array($data) ? json_encode($data) : $data);
+        die;
+    }
+}
+
+if (!function_exists('drawLetter')) {
+    /*
+ * 格式化型号, echo DrawLetter("LMGAGA 质量 &&*****") 输出：LMGAGA
+ * @param $g string 关键词
+ */
+    function drawLetter($g){
+        $g = preg_replace('/[\x{4e00}-\x{9fff}]+/u', '', $g);
+        $g = preg_replace('/[^A-Za-z0-9]+/', '', $g);
+        return strtoupper($g);
+    }
+}
+
+if (!function_exists('buildQuery')) {
+    function buildQuery($query, $where)
+    {
+        foreach ($where as $subWhere) {
+            if (count($subWhere) == 2) {
+                $fiels = $exp = $subWhere[0] ?? "";
+                $value = $subWhere[1] ?? null;
+                if (empty($fiels) || $value === null) {
+                    continue;
+                }
+                if ($exp == "or") {
+                    $query->orWhere(function ($q) use ($value) {
+                        buildQuery($q, $value);
+                    });
+                } else {
+                    $query->where($subWhere[0], $subWhere[1]);
+                }
+            } else if (count($subWhere) == 3) {
+                $fiels = $subWhere[0] ?? "";
+                $exp = $subWhere[1] ?? null;
+                $value = $subWhere[2] ?? null;
+                if (empty($fiels) || $exp === null || $value === null) {
+                    continue;
+                }
+                if ($exp == "in" && is_array($value) && !empty($value)) {
+                    $query->whereIn($fiels, $value);
+                } else {
+                    $query->where($fiels, $exp, $value);
+                }
+            }
+        }
+        return $query;
+    }
+}
+
+if (!function_exists('echoToSql')) {
+    function echoToSql($query){
+        $tmp = str_replace('?', '"'.'%s'.'"', $query->toSql());
+        $tmp = vsprintf($tmp, $query->getBindings());
+        dd($tmp);
+    }
+}
+
+/**
+ * Notes:提取数组中某个字段$searchkey作为键值，然后从数组中检索给定的键的所有值
+ * User: sl
+ * Date: 2022/5/25 15:39
+ * @param $arr
+ * @param $key
+ * @param $val
+ * @return array
+ */
+function  flipArrayPluck($arr,$newKey,$seachKey){
+    $newArr = [];
+    foreach($arr as $v){
+        $newArr[$v[$newKey]][] = $v[$seachKey];
+    }
+    return $newArr;
+}
+
+
+if (!function_exists('checkArrayValuesNotEmpty')) {
+    function checkArrayValuesNotEmpty($arr=[]){
+        $result = true;
+        if(is_array($arr)){
+            foreach($arr as $val){
+                if(empty($val)){
+                    $result = false;
+                    break;
+                }
+            }
+        }else{
+            $result = false;
+        }
+        return $result;
+    }
+}
+
+/*
+ * 遍历数组中某个字段的值 作为 键   返回新数组
+ */
+function arrayChangeKeyByField($list, $searchKey)
+{
+    $arr = [];
+    if (!$searchKey) {
+        return $list;
+    }
+    foreach ($list as $k => $v) {
+        if (isset($v[$searchKey])) {
+            $arr[$v[$searchKey]] = $v;
+        }
+    }
+    return $arr ? $arr : $list;
+}
+
+
+/*
+ * 把数组中null的字符串转为空
+ */
+function conversionArray($arr)
+{
+    if (empty($arr)) {
+        return $arr;
+    }
+
+    foreach ($arr as $k => $v) {
+        if (is_array($v)) {
+            $arr[$k] = conversionArray($v);
+        } else {
+            if ($v === null) {
+                $arr[$k] = "";
+            }
+        }
+    }
+    return $arr;
+}
+
+function dateDefault($time)
+{
+    $time = intval($time);
+    if ($time) {
+        return date("Y-m-d H:i:s", $time);
+    }
+    return "";
+}
+
+function arraySort($list, $keys, $sort = "asc")
+{
+    if ($sort == "asc") {
+        $sort = SORT_ASC;
+    } else {
+        $sort = SORT_DESC;
+    }
+    array_multisort(array_column($list, $keys), $sort, $list);
+    return $list;
+}
+
+
+/*
+ * 去重数组
+ * 过滤数组
+ */
+function array_filter_unique($arr)
+{
+    return array_unique(array_filter($arr));
+}
+
+
+/*
+ * 截取字符串
+ */
+//如果字符串长度超过10，则截取并以省略号结尾
+function truncStr($str, $len = 100, $endStr = "")
+{
+    $str = (string)$str;
+    if (mb_strlen($str, 'utf-8') > $len) {
+        return mb_substr($str, 0, $len, 'utf-8') . $endStr;
+    } else {
+        return $str;
+    }
+}
+
+/*
+ * 获取登录者的信息
+ */
+function getAdminUser()
+{
+    $admin = request()->get("user");
+    if (!$admin) {
+        throw new \App\Exceptions\InvalidRequestException("没找到登录相关信息,请先登录~_~");
+    }
+    $arr = [];
+    $arr["userId"] = $admin->userId;
+    $arr["name"] = $admin->name;
+    $arr["email"] = $admin->email;
+    $arr["engName"] = $admin->engName;
+    return $arr;
+}
+
+/*
+ * 获取登录者用户id
+ */
+function getAdminUserId()
+{
+    $admin = request()->get("user");
+    if (!$admin) {
+        throw new \App\Exceptions\InvalidRequestException("没找到登录相关信息,请先登录~_~");
+    }
+    return $admin->userId;
+}
+
+/*
+ * 获取登录者的名字
+ */
+function getAdminUserName()
+{
+    $admin = request()->get("user");
+    if (!$admin) {
+        throw new \App\Exceptions\InvalidRequestException("没找到登录相关信息,请先登录~_~");
+    }
+    return $admin->name;
+}
+
+/**
+ * 是否为多维数组
+ * @param array $arr
+ * @return bool
+ */
+function isMultipleArray(array &$arr): bool
+{
+    if (count($arr) <= 0) {
+        return false;
+    }
+
+    if (count($arr) == count($arr, COUNT_RECURSIVE)) {
+        foreach ($arr as $tempArr) {
+            if (is_array($tempArr)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    return true;
+}
+
+//判断是否有对应的权限
+//request()->perms是Permission中间件过来的
+function checkPerm($perm): bool
+{
+    $perms = request()->perms ?: [];
+    return in_array($perm, $perms);
+}
+
+
+/**
+ * 价格格式化
+ * @param  [type]  $price [description]
+ * @param integer $sign [description]
+ * @param integer $num [description]
+ * @return [type]         [description]
+ */
+function price_format($price, $sign = 0, $num = 2, $sep = '')
+{
+    $minus = $price < 0 ? '-' : '';
+    $price = floatval(strval($price));
+    $price = number_format(abs($price), $num, '.', $sep);
+    $sign = \Arr::get(config("field.currency_sign"),intval($sign),"");
+    if (!empty($sign)) {
+        $price = $sign . $price;
+    }
+    if($minus){
+        return $minus.$price;
+    }
+    return $price;
+}
+
+
+function arrayGet($arr, $key, $default = "", $func = "")
+{
+    if (isset($arr[$key])) {
+        if ($func && is_callable($func)) {
+            try {
+                return $func($arr[$key]);
+            } catch (\Throwable $e) {
+                return $arr[$key];
+            }
+        } else {
+            return $arr[$key];
+        }
+
+    } else {
+        return $default;
+    }
+}
+
+/*
+ * 构建时间查询
+ */
+function buildQueryTimeRange($time = "")
+{
+    $time = explode("~", $time);
+    $buildTimeQueryData["begin_time"] = isset($time[0]) ? $time[0] : "";
+    $buildTimeQueryData["end_time"] = isset($time[1]) ? $time[1] : "";
+    return $buildTimeQueryData;
+}
\ No newline at end of file

composer.json

@@ -44,6 +44,9 @@
         "classmap": [
         "classmap": [
             "database/seeds",
             "database/seeds",
             "database/factories"
             "database/factories"
+        ],
+        "files":[
+            "app/helpers.php"
         ]
         ]
     },
     },
     "autoload-dev": {
     "autoload-dev": {

config/database.php

@@ -162,6 +162,7 @@ return [
             'database' => env('REDIS_CACHE_DB', '1'),
             'database' => env('REDIS_CACHE_DB', '1'),
         ],
         ],
 
 
+
     ],
     ],
 
 
 ];
 ];

dcat_admin_ide_helper.php

@@ -37,42 +37,41 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection avatar
      * @property Grid\Column|Collection avatar
      * @property Grid\Column|Collection remember_token
      * @property Grid\Column|Collection remember_token
      * @property Grid\Column|Collection cart_id
      * @property Grid\Column|Collection cart_id
-     * @property Grid\Column|Collection user_sign
      * @property Grid\Column|Collection goods_id
      * @property Grid\Column|Collection goods_id
-     * @property Grid\Column|Collection brand_id
-     * @property Grid\Column|Collection standard_brand_id
-     * @property Grid\Column|Collection supplier_id
-     * @property Grid\Column|Collection goods_sn
      * @property Grid\Column|Collection goods_name
      * @property Grid\Column|Collection goods_name
-     * @property Grid\Column|Collection sku_name
+     * @property Grid\Column|Collection brand_id
      * @property Grid\Column|Collection brand_name
      * @property Grid\Column|Collection brand_name
-     * @property Grid\Column|Collection standard_brand_name
+     * @property Grid\Column|Collection supplier_id
      * @property Grid\Column|Collection supplier_name
      * @property Grid\Column|Collection supplier_name
-     * @property Grid\Column|Collection warehouse
-     * @property Grid\Column|Collection goods_number
-     * @property Grid\Column|Collection goods_price
-     * @property Grid\Column|Collection create_goods_price
-     * @property Grid\Column|Collection initial_price
-     * @property Grid\Column|Collection order_source
-     * @property Grid\Column|Collection goods_data
-     * @property Grid\Column|Collection currency
-     * @property Grid\Column|Collection delivery_place
-     * @property Grid\Column|Collection change_place
-     * @property Grid\Column|Collection sale_type
-     * @property Grid\Column|Collection goods_type
+     * @property Grid\Column|Collection buy_number
+     * @property Grid\Column|Collection buy_price
      * @property Grid\Column|Collection status
      * @property Grid\Column|Collection status
-     * @property Grid\Column|Collection bom_id
-     * @property Grid\Column|Collection extend_type_id
-     * @property Grid\Column|Collection extend_type
-     * @property Grid\Column|Collection is_remind
-     * @property Grid\Column|Collection buyer_id
-     * @property Grid\Column|Collection batch
+     * @property Grid\Column|Collection currency
      * @property Grid\Column|Collection remarks
      * @property Grid\Column|Collection remarks
      * @property Grid\Column|Collection raw_goods_sn
      * @property Grid\Column|Collection raw_goods_sn
      * @property Grid\Column|Collection raw_goods_packing
      * @property Grid\Column|Collection raw_goods_packing
      * @property Grid\Column|Collection raw_brand_name
      * @property Grid\Column|Collection raw_brand_name
      * @property Grid\Column|Collection create_time
      * @property Grid\Column|Collection create_time
      * @property Grid\Column|Collection update_time
      * @property Grid\Column|Collection update_time
+     * @property Grid\Column|Collection iso3
+     * @property Grid\Column|Collection numeric_code
+     * @property Grid\Column|Collection iso2
+     * @property Grid\Column|Collection phonecode
+     * @property Grid\Column|Collection capital
+     * @property Grid\Column|Collection currency_name
+     * @property Grid\Column|Collection currency_symbol
+     * @property Grid\Column|Collection tld
+     * @property Grid\Column|Collection native
+     * @property Grid\Column|Collection region
+     * @property Grid\Column|Collection subregion
+     * @property Grid\Column|Collection timezones
+     * @property Grid\Column|Collection translations
+     * @property Grid\Column|Collection latitude
+     * @property Grid\Column|Collection longitude
+     * @property Grid\Column|Collection emoji
+     * @property Grid\Column|Collection emojiU
+     * @property Grid\Column|Collection flag
+     * @property Grid\Column|Collection wikiDataId
      * @property Grid\Column|Collection connection
      * @property Grid\Column|Collection connection
      * @property Grid\Column|Collection queue
      * @property Grid\Column|Collection queue
      * @property Grid\Column|Collection payload
      * @property Grid\Column|Collection payload
@@ -82,6 +81,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection sales_id
      * @property Grid\Column|Collection sales_id
      * @property Grid\Column|Collection inquiry_sn
      * @property Grid\Column|Collection inquiry_sn
      * @property Grid\Column|Collection source
      * @property Grid\Column|Collection source
+     * @property Grid\Column|Collection delivery_place
      * @property Grid\Column|Collection remark
      * @property Grid\Column|Collection remark
      * @property Grid\Column|Collection priority
      * @property Grid\Column|Collection priority
      * @property Grid\Column|Collection user_types
      * @property Grid\Column|Collection user_types
@@ -89,6 +89,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection processing_time
      * @property Grid\Column|Collection processing_time
      * @property Grid\Column|Collection item_id
      * @property Grid\Column|Collection item_id
      * @property Grid\Column|Collection inquiry_number
      * @property Grid\Column|Collection inquiry_number
+     * @property Grid\Column|Collection batch
      * @property Grid\Column|Collection inquiry_type
      * @property Grid\Column|Collection inquiry_type
      * @property Grid\Column|Collection create_name
      * @property Grid\Column|Collection create_name
      * @property Grid\Column|Collection migration
      * @property Grid\Column|Collection migration
@@ -96,10 +97,12 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection order_sn
      * @property Grid\Column|Collection order_sn
      * @property Grid\Column|Collection erp_order_id
      * @property Grid\Column|Collection erp_order_id
      * @property Grid\Column|Collection order_type
      * @property Grid\Column|Collection order_type
+     * @property Grid\Column|Collection order_source
      * @property Grid\Column|Collection order_pay_type
      * @property Grid\Column|Collection order_pay_type
      * @property Grid\Column|Collection company_name
      * @property Grid\Column|Collection company_name
      * @property Grid\Column|Collection order_amount
      * @property Grid\Column|Collection order_amount
      * @property Grid\Column|Collection advance_amount
      * @property Grid\Column|Collection advance_amount
+     * @property Grid\Column|Collection exchange_rate
      * @property Grid\Column|Collection order_remark
      * @property Grid\Column|Collection order_remark
      * @property Grid\Column|Collection pay_suffix
      * @property Grid\Column|Collection pay_suffix
      * @property Grid\Column|Collection confirm_time
      * @property Grid\Column|Collection confirm_time
@@ -126,19 +129,38 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection city
      * @property Grid\Column|Collection city
      * @property Grid\Column|Collection detail_address
      * @property Grid\Column|Collection detail_address
      * @property Grid\Column|Collection rec_id
      * @property Grid\Column|Collection rec_id
+     * @property Grid\Column|Collection standard_brand_id
+     * @property Grid\Column|Collection class_id2
+     * @property Grid\Column|Collection class_id2_name
+     * @property Grid\Column|Collection standard_brand_name
+     * @property Grid\Column|Collection goods_type
+     * @property Grid\Column|Collection goods_number
+     * @property Grid\Column|Collection goods_price
      * @property Grid\Column|Collection delivery_time
      * @property Grid\Column|Collection delivery_time
      * @property Grid\Column|Collection canal
      * @property Grid\Column|Collection canal
+     * @property Grid\Column|Collection initial_price
      * @property Grid\Column|Collection purchase_uid
      * @property Grid\Column|Collection purchase_uid
      * @property Grid\Column|Collection contract_remark
      * @property Grid\Column|Collection contract_remark
      * @property Grid\Column|Collection tax_rate
      * @property Grid\Column|Collection tax_rate
+     * @property Grid\Column|Collection discount_amount
+     * @property Grid\Column|Collection other_amount
+     * @property Grid\Column|Collection price_id
+     * @property Grid\Column|Collection price
+     * @property Grid\Column|Collection price_type
+     * @property Grid\Column|Collection return_items_id
+     * @property Grid\Column|Collection return_num
+     * @property Grid\Column|Collection return_price
+     * @property Grid\Column|Collection return_amount
      * @property Grid\Column|Collection token
      * @property Grid\Column|Collection token
+     * @property Grid\Column|Collection post_code
      * @property Grid\Column|Collection is_default
      * @property Grid\Column|Collection is_default
+     * @property Grid\Column|Collection last_name
+     * @property Grid\Column|Collection first_name
      * @property Grid\Column|Collection user_sn
      * @property Grid\Column|Collection user_sn
      * @property Grid\Column|Collection email_verified_at
      * @property Grid\Column|Collection email_verified_at
      * @property Grid\Column|Collection account_properties
      * @property Grid\Column|Collection account_properties
-     * @property Grid\Column|Collection first_name
-     * @property Grid\Column|Collection last_name
      * @property Grid\Column|Collection created_time
      * @property Grid\Column|Collection created_time
+     * @property Grid\Column|Collection reg_source
      * @property Grid\Column|Collection config_id
      * @property Grid\Column|Collection config_id
      * @property Grid\Column|Collection config_title
      * @property Grid\Column|Collection config_title
      * @property Grid\Column|Collection config_schema
      * @property Grid\Column|Collection config_schema
@@ -237,7 +259,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection local
      * @property Grid\Column|Collection local
      * @property Grid\Column|Collection mobile
      * @property Grid\Column|Collection mobile
      * @property Grid\Column|Collection num
      * @property Grid\Column|Collection num
-     * @property Grid\Column|Collection price
      * @property Grid\Column|Collection end_time
      * @property Grid\Column|Collection end_time
      * @property Grid\Column|Collection model_name
      * @property Grid\Column|Collection model_name
      * @property Grid\Column|Collection model_key
      * @property Grid\Column|Collection model_key
@@ -382,42 +403,41 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection avatar(string $label = null)
      * @method Grid\Column|Collection avatar(string $label = null)
      * @method Grid\Column|Collection remember_token(string $label = null)
      * @method Grid\Column|Collection remember_token(string $label = null)
      * @method Grid\Column|Collection cart_id(string $label = null)
      * @method Grid\Column|Collection cart_id(string $label = null)
-     * @method Grid\Column|Collection user_sign(string $label = null)
      * @method Grid\Column|Collection goods_id(string $label = null)
      * @method Grid\Column|Collection goods_id(string $label = null)
-     * @method Grid\Column|Collection brand_id(string $label = null)
-     * @method Grid\Column|Collection standard_brand_id(string $label = null)
-     * @method Grid\Column|Collection supplier_id(string $label = null)
-     * @method Grid\Column|Collection goods_sn(string $label = null)
      * @method Grid\Column|Collection goods_name(string $label = null)
      * @method Grid\Column|Collection goods_name(string $label = null)
-     * @method Grid\Column|Collection sku_name(string $label = null)
+     * @method Grid\Column|Collection brand_id(string $label = null)
      * @method Grid\Column|Collection brand_name(string $label = null)
      * @method Grid\Column|Collection brand_name(string $label = null)
-     * @method Grid\Column|Collection standard_brand_name(string $label = null)
+     * @method Grid\Column|Collection supplier_id(string $label = null)
      * @method Grid\Column|Collection supplier_name(string $label = null)
      * @method Grid\Column|Collection supplier_name(string $label = null)
-     * @method Grid\Column|Collection warehouse(string $label = null)
-     * @method Grid\Column|Collection goods_number(string $label = null)
-     * @method Grid\Column|Collection goods_price(string $label = null)
-     * @method Grid\Column|Collection create_goods_price(string $label = null)
-     * @method Grid\Column|Collection initial_price(string $label = null)
-     * @method Grid\Column|Collection order_source(string $label = null)
-     * @method Grid\Column|Collection goods_data(string $label = null)
-     * @method Grid\Column|Collection currency(string $label = null)
-     * @method Grid\Column|Collection delivery_place(string $label = null)
-     * @method Grid\Column|Collection change_place(string $label = null)
-     * @method Grid\Column|Collection sale_type(string $label = null)
-     * @method Grid\Column|Collection goods_type(string $label = null)
+     * @method Grid\Column|Collection buy_number(string $label = null)
+     * @method Grid\Column|Collection buy_price(string $label = null)
      * @method Grid\Column|Collection status(string $label = null)
      * @method Grid\Column|Collection status(string $label = null)
-     * @method Grid\Column|Collection bom_id(string $label = null)
-     * @method Grid\Column|Collection extend_type_id(string $label = null)
-     * @method Grid\Column|Collection extend_type(string $label = null)
-     * @method Grid\Column|Collection is_remind(string $label = null)
-     * @method Grid\Column|Collection buyer_id(string $label = null)
-     * @method Grid\Column|Collection batch(string $label = null)
+     * @method Grid\Column|Collection currency(string $label = null)
      * @method Grid\Column|Collection remarks(string $label = null)
      * @method Grid\Column|Collection remarks(string $label = null)
      * @method Grid\Column|Collection raw_goods_sn(string $label = null)
      * @method Grid\Column|Collection raw_goods_sn(string $label = null)
      * @method Grid\Column|Collection raw_goods_packing(string $label = null)
      * @method Grid\Column|Collection raw_goods_packing(string $label = null)
      * @method Grid\Column|Collection raw_brand_name(string $label = null)
      * @method Grid\Column|Collection raw_brand_name(string $label = null)
      * @method Grid\Column|Collection create_time(string $label = null)
      * @method Grid\Column|Collection create_time(string $label = null)
      * @method Grid\Column|Collection update_time(string $label = null)
      * @method Grid\Column|Collection update_time(string $label = null)
+     * @method Grid\Column|Collection iso3(string $label = null)
+     * @method Grid\Column|Collection numeric_code(string $label = null)
+     * @method Grid\Column|Collection iso2(string $label = null)
+     * @method Grid\Column|Collection phonecode(string $label = null)
+     * @method Grid\Column|Collection capital(string $label = null)
+     * @method Grid\Column|Collection currency_name(string $label = null)
+     * @method Grid\Column|Collection currency_symbol(string $label = null)
+     * @method Grid\Column|Collection tld(string $label = null)
+     * @method Grid\Column|Collection native(string $label = null)
+     * @method Grid\Column|Collection region(string $label = null)
+     * @method Grid\Column|Collection subregion(string $label = null)
+     * @method Grid\Column|Collection timezones(string $label = null)
+     * @method Grid\Column|Collection translations(string $label = null)
+     * @method Grid\Column|Collection latitude(string $label = null)
+     * @method Grid\Column|Collection longitude(string $label = null)
+     * @method Grid\Column|Collection emoji(string $label = null)
+     * @method Grid\Column|Collection emojiU(string $label = null)
+     * @method Grid\Column|Collection flag(string $label = null)
+     * @method Grid\Column|Collection wikiDataId(string $label = null)
      * @method Grid\Column|Collection connection(string $label = null)
      * @method Grid\Column|Collection connection(string $label = null)
      * @method Grid\Column|Collection queue(string $label = null)
      * @method Grid\Column|Collection queue(string $label = null)
      * @method Grid\Column|Collection payload(string $label = null)
      * @method Grid\Column|Collection payload(string $label = null)
@@ -427,6 +447,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection sales_id(string $label = null)
      * @method Grid\Column|Collection sales_id(string $label = null)
      * @method Grid\Column|Collection inquiry_sn(string $label = null)
      * @method Grid\Column|Collection inquiry_sn(string $label = null)
      * @method Grid\Column|Collection source(string $label = null)
      * @method Grid\Column|Collection source(string $label = null)
+     * @method Grid\Column|Collection delivery_place(string $label = null)
      * @method Grid\Column|Collection remark(string $label = null)
      * @method Grid\Column|Collection remark(string $label = null)
      * @method Grid\Column|Collection priority(string $label = null)
      * @method Grid\Column|Collection priority(string $label = null)
      * @method Grid\Column|Collection user_types(string $label = null)
      * @method Grid\Column|Collection user_types(string $label = null)
@@ -434,6 +455,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection processing_time(string $label = null)
      * @method Grid\Column|Collection processing_time(string $label = null)
      * @method Grid\Column|Collection item_id(string $label = null)
      * @method Grid\Column|Collection item_id(string $label = null)
      * @method Grid\Column|Collection inquiry_number(string $label = null)
      * @method Grid\Column|Collection inquiry_number(string $label = null)
+     * @method Grid\Column|Collection batch(string $label = null)
      * @method Grid\Column|Collection inquiry_type(string $label = null)
      * @method Grid\Column|Collection inquiry_type(string $label = null)
      * @method Grid\Column|Collection create_name(string $label = null)
      * @method Grid\Column|Collection create_name(string $label = null)
      * @method Grid\Column|Collection migration(string $label = null)
      * @method Grid\Column|Collection migration(string $label = null)
@@ -441,10 +463,12 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection order_sn(string $label = null)
      * @method Grid\Column|Collection order_sn(string $label = null)
      * @method Grid\Column|Collection erp_order_id(string $label = null)
      * @method Grid\Column|Collection erp_order_id(string $label = null)
      * @method Grid\Column|Collection order_type(string $label = null)
      * @method Grid\Column|Collection order_type(string $label = null)
+     * @method Grid\Column|Collection order_source(string $label = null)
      * @method Grid\Column|Collection order_pay_type(string $label = null)
      * @method Grid\Column|Collection order_pay_type(string $label = null)
      * @method Grid\Column|Collection company_name(string $label = null)
      * @method Grid\Column|Collection company_name(string $label = null)
      * @method Grid\Column|Collection order_amount(string $label = null)
      * @method Grid\Column|Collection order_amount(string $label = null)
      * @method Grid\Column|Collection advance_amount(string $label = null)
      * @method Grid\Column|Collection advance_amount(string $label = null)
+     * @method Grid\Column|Collection exchange_rate(string $label = null)
      * @method Grid\Column|Collection order_remark(string $label = null)
      * @method Grid\Column|Collection order_remark(string $label = null)
      * @method Grid\Column|Collection pay_suffix(string $label = null)
      * @method Grid\Column|Collection pay_suffix(string $label = null)
      * @method Grid\Column|Collection confirm_time(string $label = null)
      * @method Grid\Column|Collection confirm_time(string $label = null)
@@ -471,19 +495,38 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection city(string $label = null)
      * @method Grid\Column|Collection city(string $label = null)
      * @method Grid\Column|Collection detail_address(string $label = null)
      * @method Grid\Column|Collection detail_address(string $label = null)
      * @method Grid\Column|Collection rec_id(string $label = null)
      * @method Grid\Column|Collection rec_id(string $label = null)
+     * @method Grid\Column|Collection standard_brand_id(string $label = null)
+     * @method Grid\Column|Collection class_id2(string $label = null)
+     * @method Grid\Column|Collection class_id2_name(string $label = null)
+     * @method Grid\Column|Collection standard_brand_name(string $label = null)
+     * @method Grid\Column|Collection goods_type(string $label = null)
+     * @method Grid\Column|Collection goods_number(string $label = null)
+     * @method Grid\Column|Collection goods_price(string $label = null)
      * @method Grid\Column|Collection delivery_time(string $label = null)
      * @method Grid\Column|Collection delivery_time(string $label = null)
      * @method Grid\Column|Collection canal(string $label = null)
      * @method Grid\Column|Collection canal(string $label = null)
+     * @method Grid\Column|Collection initial_price(string $label = null)
      * @method Grid\Column|Collection purchase_uid(string $label = null)
      * @method Grid\Column|Collection purchase_uid(string $label = null)
      * @method Grid\Column|Collection contract_remark(string $label = null)
      * @method Grid\Column|Collection contract_remark(string $label = null)
      * @method Grid\Column|Collection tax_rate(string $label = null)
      * @method Grid\Column|Collection tax_rate(string $label = null)
+     * @method Grid\Column|Collection discount_amount(string $label = null)
+     * @method Grid\Column|Collection other_amount(string $label = null)
+     * @method Grid\Column|Collection price_id(string $label = null)
+     * @method Grid\Column|Collection price(string $label = null)
+     * @method Grid\Column|Collection price_type(string $label = null)
+     * @method Grid\Column|Collection return_items_id(string $label = null)
+     * @method Grid\Column|Collection return_num(string $label = null)
+     * @method Grid\Column|Collection return_price(string $label = null)
+     * @method Grid\Column|Collection return_amount(string $label = null)
      * @method Grid\Column|Collection token(string $label = null)
      * @method Grid\Column|Collection token(string $label = null)
+     * @method Grid\Column|Collection post_code(string $label = null)
      * @method Grid\Column|Collection is_default(string $label = null)
      * @method Grid\Column|Collection is_default(string $label = null)
+     * @method Grid\Column|Collection last_name(string $label = null)
+     * @method Grid\Column|Collection first_name(string $label = null)
      * @method Grid\Column|Collection user_sn(string $label = null)
      * @method Grid\Column|Collection user_sn(string $label = null)
      * @method Grid\Column|Collection email_verified_at(string $label = null)
      * @method Grid\Column|Collection email_verified_at(string $label = null)
      * @method Grid\Column|Collection account_properties(string $label = null)
      * @method Grid\Column|Collection account_properties(string $label = null)
-     * @method Grid\Column|Collection first_name(string $label = null)
-     * @method Grid\Column|Collection last_name(string $label = null)
      * @method Grid\Column|Collection created_time(string $label = null)
      * @method Grid\Column|Collection created_time(string $label = null)
+     * @method Grid\Column|Collection reg_source(string $label = null)
      * @method Grid\Column|Collection config_id(string $label = null)
      * @method Grid\Column|Collection config_id(string $label = null)
      * @method Grid\Column|Collection config_title(string $label = null)
      * @method Grid\Column|Collection config_title(string $label = null)
      * @method Grid\Column|Collection config_schema(string $label = null)
      * @method Grid\Column|Collection config_schema(string $label = null)
@@ -582,7 +625,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection local(string $label = null)
      * @method Grid\Column|Collection local(string $label = null)
      * @method Grid\Column|Collection mobile(string $label = null)
      * @method Grid\Column|Collection mobile(string $label = null)
      * @method Grid\Column|Collection num(string $label = null)
      * @method Grid\Column|Collection num(string $label = null)
-     * @method Grid\Column|Collection price(string $label = null)
      * @method Grid\Column|Collection end_time(string $label = null)
      * @method Grid\Column|Collection end_time(string $label = null)
      * @method Grid\Column|Collection model_name(string $label = null)
      * @method Grid\Column|Collection model_name(string $label = null)
      * @method Grid\Column|Collection model_key(string $label = null)
      * @method Grid\Column|Collection model_key(string $label = null)
@@ -732,42 +774,41 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection avatar
      * @property Show\Field|Collection avatar
      * @property Show\Field|Collection remember_token
      * @property Show\Field|Collection remember_token
      * @property Show\Field|Collection cart_id
      * @property Show\Field|Collection cart_id
-     * @property Show\Field|Collection user_sign
      * @property Show\Field|Collection goods_id
      * @property Show\Field|Collection goods_id
-     * @property Show\Field|Collection brand_id
-     * @property Show\Field|Collection standard_brand_id
-     * @property Show\Field|Collection supplier_id
-     * @property Show\Field|Collection goods_sn
      * @property Show\Field|Collection goods_name
      * @property Show\Field|Collection goods_name
-     * @property Show\Field|Collection sku_name
+     * @property Show\Field|Collection brand_id
      * @property Show\Field|Collection brand_name
      * @property Show\Field|Collection brand_name
-     * @property Show\Field|Collection standard_brand_name
+     * @property Show\Field|Collection supplier_id
      * @property Show\Field|Collection supplier_name
      * @property Show\Field|Collection supplier_name
-     * @property Show\Field|Collection warehouse
-     * @property Show\Field|Collection goods_number
-     * @property Show\Field|Collection goods_price
-     * @property Show\Field|Collection create_goods_price
-     * @property Show\Field|Collection initial_price
-     * @property Show\Field|Collection order_source
-     * @property Show\Field|Collection goods_data
-     * @property Show\Field|Collection currency
-     * @property Show\Field|Collection delivery_place
-     * @property Show\Field|Collection change_place
-     * @property Show\Field|Collection sale_type
-     * @property Show\Field|Collection goods_type
+     * @property Show\Field|Collection buy_number
+     * @property Show\Field|Collection buy_price
      * @property Show\Field|Collection status
      * @property Show\Field|Collection status
-     * @property Show\Field|Collection bom_id
-     * @property Show\Field|Collection extend_type_id
-     * @property Show\Field|Collection extend_type
-     * @property Show\Field|Collection is_remind
-     * @property Show\Field|Collection buyer_id
-     * @property Show\Field|Collection batch
+     * @property Show\Field|Collection currency
      * @property Show\Field|Collection remarks
      * @property Show\Field|Collection remarks
      * @property Show\Field|Collection raw_goods_sn
      * @property Show\Field|Collection raw_goods_sn
      * @property Show\Field|Collection raw_goods_packing
      * @property Show\Field|Collection raw_goods_packing
      * @property Show\Field|Collection raw_brand_name
      * @property Show\Field|Collection raw_brand_name
      * @property Show\Field|Collection create_time
      * @property Show\Field|Collection create_time
      * @property Show\Field|Collection update_time
      * @property Show\Field|Collection update_time
+     * @property Show\Field|Collection iso3
+     * @property Show\Field|Collection numeric_code
+     * @property Show\Field|Collection iso2
+     * @property Show\Field|Collection phonecode
+     * @property Show\Field|Collection capital
+     * @property Show\Field|Collection currency_name
+     * @property Show\Field|Collection currency_symbol
+     * @property Show\Field|Collection tld
+     * @property Show\Field|Collection native
+     * @property Show\Field|Collection region
+     * @property Show\Field|Collection subregion
+     * @property Show\Field|Collection timezones
+     * @property Show\Field|Collection translations
+     * @property Show\Field|Collection latitude
+     * @property Show\Field|Collection longitude
+     * @property Show\Field|Collection emoji
+     * @property Show\Field|Collection emojiU
+     * @property Show\Field|Collection flag
+     * @property Show\Field|Collection wikiDataId
      * @property Show\Field|Collection connection
      * @property Show\Field|Collection connection
      * @property Show\Field|Collection queue
      * @property Show\Field|Collection queue
      * @property Show\Field|Collection payload
      * @property Show\Field|Collection payload
@@ -777,6 +818,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection sales_id
      * @property Show\Field|Collection sales_id
      * @property Show\Field|Collection inquiry_sn
      * @property Show\Field|Collection inquiry_sn
      * @property Show\Field|Collection source
      * @property Show\Field|Collection source
+     * @property Show\Field|Collection delivery_place
      * @property Show\Field|Collection remark
      * @property Show\Field|Collection remark
      * @property Show\Field|Collection priority
      * @property Show\Field|Collection priority
      * @property Show\Field|Collection user_types
      * @property Show\Field|Collection user_types
@@ -784,6 +826,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection processing_time
      * @property Show\Field|Collection processing_time
      * @property Show\Field|Collection item_id
      * @property Show\Field|Collection item_id
      * @property Show\Field|Collection inquiry_number
      * @property Show\Field|Collection inquiry_number
+     * @property Show\Field|Collection batch
      * @property Show\Field|Collection inquiry_type
      * @property Show\Field|Collection inquiry_type
      * @property Show\Field|Collection create_name
      * @property Show\Field|Collection create_name
      * @property Show\Field|Collection migration
      * @property Show\Field|Collection migration
@@ -791,10 +834,12 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection order_sn
      * @property Show\Field|Collection order_sn
      * @property Show\Field|Collection erp_order_id
      * @property Show\Field|Collection erp_order_id
      * @property Show\Field|Collection order_type
      * @property Show\Field|Collection order_type
+     * @property Show\Field|Collection order_source
      * @property Show\Field|Collection order_pay_type
      * @property Show\Field|Collection order_pay_type
      * @property Show\Field|Collection company_name
      * @property Show\Field|Collection company_name
      * @property Show\Field|Collection order_amount
      * @property Show\Field|Collection order_amount
      * @property Show\Field|Collection advance_amount
      * @property Show\Field|Collection advance_amount
+     * @property Show\Field|Collection exchange_rate
      * @property Show\Field|Collection order_remark
      * @property Show\Field|Collection order_remark
      * @property Show\Field|Collection pay_suffix
      * @property Show\Field|Collection pay_suffix
      * @property Show\Field|Collection confirm_time
      * @property Show\Field|Collection confirm_time
@@ -821,19 +866,38 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection city
      * @property Show\Field|Collection city
      * @property Show\Field|Collection detail_address
      * @property Show\Field|Collection detail_address
      * @property Show\Field|Collection rec_id
      * @property Show\Field|Collection rec_id
+     * @property Show\Field|Collection standard_brand_id
+     * @property Show\Field|Collection class_id2
+     * @property Show\Field|Collection class_id2_name
+     * @property Show\Field|Collection standard_brand_name
+     * @property Show\Field|Collection goods_type
+     * @property Show\Field|Collection goods_number
+     * @property Show\Field|Collection goods_price
      * @property Show\Field|Collection delivery_time
      * @property Show\Field|Collection delivery_time
      * @property Show\Field|Collection canal
      * @property Show\Field|Collection canal
+     * @property Show\Field|Collection initial_price
      * @property Show\Field|Collection purchase_uid
      * @property Show\Field|Collection purchase_uid
      * @property Show\Field|Collection contract_remark
      * @property Show\Field|Collection contract_remark
      * @property Show\Field|Collection tax_rate
      * @property Show\Field|Collection tax_rate
+     * @property Show\Field|Collection discount_amount
+     * @property Show\Field|Collection other_amount
+     * @property Show\Field|Collection price_id
+     * @property Show\Field|Collection price
+     * @property Show\Field|Collection price_type
+     * @property Show\Field|Collection return_items_id
+     * @property Show\Field|Collection return_num
+     * @property Show\Field|Collection return_price
+     * @property Show\Field|Collection return_amount
      * @property Show\Field|Collection token
      * @property Show\Field|Collection token
+     * @property Show\Field|Collection post_code
      * @property Show\Field|Collection is_default
      * @property Show\Field|Collection is_default
+     * @property Show\Field|Collection last_name
+     * @property Show\Field|Collection first_name
      * @property Show\Field|Collection user_sn
      * @property Show\Field|Collection user_sn
      * @property Show\Field|Collection email_verified_at
      * @property Show\Field|Collection email_verified_at
      * @property Show\Field|Collection account_properties
      * @property Show\Field|Collection account_properties
-     * @property Show\Field|Collection first_name
-     * @property Show\Field|Collection last_name
      * @property Show\Field|Collection created_time
      * @property Show\Field|Collection created_time
+     * @property Show\Field|Collection reg_source
      * @property Show\Field|Collection config_id
      * @property Show\Field|Collection config_id
      * @property Show\Field|Collection config_title
      * @property Show\Field|Collection config_title
      * @property Show\Field|Collection config_schema
      * @property Show\Field|Collection config_schema
@@ -932,7 +996,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection local
      * @property Show\Field|Collection local
      * @property Show\Field|Collection mobile
      * @property Show\Field|Collection mobile
      * @property Show\Field|Collection num
      * @property Show\Field|Collection num
-     * @property Show\Field|Collection price
      * @property Show\Field|Collection end_time
      * @property Show\Field|Collection end_time
      * @property Show\Field|Collection model_name
      * @property Show\Field|Collection model_name
      * @property Show\Field|Collection model_key
      * @property Show\Field|Collection model_key
@@ -1077,42 +1140,41 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection avatar(string $label = null)
      * @method Show\Field|Collection avatar(string $label = null)
      * @method Show\Field|Collection remember_token(string $label = null)
      * @method Show\Field|Collection remember_token(string $label = null)
      * @method Show\Field|Collection cart_id(string $label = null)
      * @method Show\Field|Collection cart_id(string $label = null)
-     * @method Show\Field|Collection user_sign(string $label = null)
      * @method Show\Field|Collection goods_id(string $label = null)
      * @method Show\Field|Collection goods_id(string $label = null)
-     * @method Show\Field|Collection brand_id(string $label = null)
-     * @method Show\Field|Collection standard_brand_id(string $label = null)
-     * @method Show\Field|Collection supplier_id(string $label = null)
-     * @method Show\Field|Collection goods_sn(string $label = null)
      * @method Show\Field|Collection goods_name(string $label = null)
      * @method Show\Field|Collection goods_name(string $label = null)
-     * @method Show\Field|Collection sku_name(string $label = null)
+     * @method Show\Field|Collection brand_id(string $label = null)
      * @method Show\Field|Collection brand_name(string $label = null)
      * @method Show\Field|Collection brand_name(string $label = null)
-     * @method Show\Field|Collection standard_brand_name(string $label = null)
+     * @method Show\Field|Collection supplier_id(string $label = null)
      * @method Show\Field|Collection supplier_name(string $label = null)
      * @method Show\Field|Collection supplier_name(string $label = null)
-     * @method Show\Field|Collection warehouse(string $label = null)
-     * @method Show\Field|Collection goods_number(string $label = null)
-     * @method Show\Field|Collection goods_price(string $label = null)
-     * @method Show\Field|Collection create_goods_price(string $label = null)
-     * @method Show\Field|Collection initial_price(string $label = null)
-     * @method Show\Field|Collection order_source(string $label = null)
-     * @method Show\Field|Collection goods_data(string $label = null)
-     * @method Show\Field|Collection currency(string $label = null)
-     * @method Show\Field|Collection delivery_place(string $label = null)
-     * @method Show\Field|Collection change_place(string $label = null)
-     * @method Show\Field|Collection sale_type(string $label = null)
-     * @method Show\Field|Collection goods_type(string $label = null)
+     * @method Show\Field|Collection buy_number(string $label = null)
+     * @method Show\Field|Collection buy_price(string $label = null)
      * @method Show\Field|Collection status(string $label = null)
      * @method Show\Field|Collection status(string $label = null)
-     * @method Show\Field|Collection bom_id(string $label = null)
-     * @method Show\Field|Collection extend_type_id(string $label = null)
-     * @method Show\Field|Collection extend_type(string $label = null)
-     * @method Show\Field|Collection is_remind(string $label = null)
-     * @method Show\Field|Collection buyer_id(string $label = null)
-     * @method Show\Field|Collection batch(string $label = null)
+     * @method Show\Field|Collection currency(string $label = null)
      * @method Show\Field|Collection remarks(string $label = null)
      * @method Show\Field|Collection remarks(string $label = null)
      * @method Show\Field|Collection raw_goods_sn(string $label = null)
      * @method Show\Field|Collection raw_goods_sn(string $label = null)
      * @method Show\Field|Collection raw_goods_packing(string $label = null)
      * @method Show\Field|Collection raw_goods_packing(string $label = null)
      * @method Show\Field|Collection raw_brand_name(string $label = null)
      * @method Show\Field|Collection raw_brand_name(string $label = null)
      * @method Show\Field|Collection create_time(string $label = null)
      * @method Show\Field|Collection create_time(string $label = null)
      * @method Show\Field|Collection update_time(string $label = null)
      * @method Show\Field|Collection update_time(string $label = null)
+     * @method Show\Field|Collection iso3(string $label = null)
+     * @method Show\Field|Collection numeric_code(string $label = null)
+     * @method Show\Field|Collection iso2(string $label = null)
+     * @method Show\Field|Collection phonecode(string $label = null)
+     * @method Show\Field|Collection capital(string $label = null)
+     * @method Show\Field|Collection currency_name(string $label = null)
+     * @method Show\Field|Collection currency_symbol(string $label = null)
+     * @method Show\Field|Collection tld(string $label = null)
+     * @method Show\Field|Collection native(string $label = null)
+     * @method Show\Field|Collection region(string $label = null)
+     * @method Show\Field|Collection subregion(string $label = null)
+     * @method Show\Field|Collection timezones(string $label = null)
+     * @method Show\Field|Collection translations(string $label = null)
+     * @method Show\Field|Collection latitude(string $label = null)
+     * @method Show\Field|Collection longitude(string $label = null)
+     * @method Show\Field|Collection emoji(string $label = null)
+     * @method Show\Field|Collection emojiU(string $label = null)
+     * @method Show\Field|Collection flag(string $label = null)
+     * @method Show\Field|Collection wikiDataId(string $label = null)
      * @method Show\Field|Collection connection(string $label = null)
      * @method Show\Field|Collection connection(string $label = null)
      * @method Show\Field|Collection queue(string $label = null)
      * @method Show\Field|Collection queue(string $label = null)
      * @method Show\Field|Collection payload(string $label = null)
      * @method Show\Field|Collection payload(string $label = null)
@@ -1122,6 +1184,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection sales_id(string $label = null)
      * @method Show\Field|Collection sales_id(string $label = null)
      * @method Show\Field|Collection inquiry_sn(string $label = null)
      * @method Show\Field|Collection inquiry_sn(string $label = null)
      * @method Show\Field|Collection source(string $label = null)
      * @method Show\Field|Collection source(string $label = null)
+     * @method Show\Field|Collection delivery_place(string $label = null)
      * @method Show\Field|Collection remark(string $label = null)
      * @method Show\Field|Collection remark(string $label = null)
      * @method Show\Field|Collection priority(string $label = null)
      * @method Show\Field|Collection priority(string $label = null)
      * @method Show\Field|Collection user_types(string $label = null)
      * @method Show\Field|Collection user_types(string $label = null)
@@ -1129,6 +1192,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection processing_time(string $label = null)
      * @method Show\Field|Collection processing_time(string $label = null)
      * @method Show\Field|Collection item_id(string $label = null)
      * @method Show\Field|Collection item_id(string $label = null)
      * @method Show\Field|Collection inquiry_number(string $label = null)
      * @method Show\Field|Collection inquiry_number(string $label = null)
+     * @method Show\Field|Collection batch(string $label = null)
      * @method Show\Field|Collection inquiry_type(string $label = null)
      * @method Show\Field|Collection inquiry_type(string $label = null)
      * @method Show\Field|Collection create_name(string $label = null)
      * @method Show\Field|Collection create_name(string $label = null)
      * @method Show\Field|Collection migration(string $label = null)
      * @method Show\Field|Collection migration(string $label = null)
@@ -1136,10 +1200,12 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection order_sn(string $label = null)
      * @method Show\Field|Collection order_sn(string $label = null)
      * @method Show\Field|Collection erp_order_id(string $label = null)
      * @method Show\Field|Collection erp_order_id(string $label = null)
      * @method Show\Field|Collection order_type(string $label = null)
      * @method Show\Field|Collection order_type(string $label = null)
+     * @method Show\Field|Collection order_source(string $label = null)
      * @method Show\Field|Collection order_pay_type(string $label = null)
      * @method Show\Field|Collection order_pay_type(string $label = null)
      * @method Show\Field|Collection company_name(string $label = null)
      * @method Show\Field|Collection company_name(string $label = null)
      * @method Show\Field|Collection order_amount(string $label = null)
      * @method Show\Field|Collection order_amount(string $label = null)
      * @method Show\Field|Collection advance_amount(string $label = null)
      * @method Show\Field|Collection advance_amount(string $label = null)
+     * @method Show\Field|Collection exchange_rate(string $label = null)
      * @method Show\Field|Collection order_remark(string $label = null)
      * @method Show\Field|Collection order_remark(string $label = null)
      * @method Show\Field|Collection pay_suffix(string $label = null)
      * @method Show\Field|Collection pay_suffix(string $label = null)
      * @method Show\Field|Collection confirm_time(string $label = null)
      * @method Show\Field|Collection confirm_time(string $label = null)
@@ -1166,19 +1232,38 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection city(string $label = null)
      * @method Show\Field|Collection city(string $label = null)
      * @method Show\Field|Collection detail_address(string $label = null)
      * @method Show\Field|Collection detail_address(string $label = null)
      * @method Show\Field|Collection rec_id(string $label = null)
      * @method Show\Field|Collection rec_id(string $label = null)
+     * @method Show\Field|Collection standard_brand_id(string $label = null)
+     * @method Show\Field|Collection class_id2(string $label = null)
+     * @method Show\Field|Collection class_id2_name(string $label = null)
+     * @method Show\Field|Collection standard_brand_name(string $label = null)
+     * @method Show\Field|Collection goods_type(string $label = null)
+     * @method Show\Field|Collection goods_number(string $label = null)
+     * @method Show\Field|Collection goods_price(string $label = null)
      * @method Show\Field|Collection delivery_time(string $label = null)
      * @method Show\Field|Collection delivery_time(string $label = null)
      * @method Show\Field|Collection canal(string $label = null)
      * @method Show\Field|Collection canal(string $label = null)
+     * @method Show\Field|Collection initial_price(string $label = null)
      * @method Show\Field|Collection purchase_uid(string $label = null)
      * @method Show\Field|Collection purchase_uid(string $label = null)
      * @method Show\Field|Collection contract_remark(string $label = null)
      * @method Show\Field|Collection contract_remark(string $label = null)
      * @method Show\Field|Collection tax_rate(string $label = null)
      * @method Show\Field|Collection tax_rate(string $label = null)
+     * @method Show\Field|Collection discount_amount(string $label = null)
+     * @method Show\Field|Collection other_amount(string $label = null)
+     * @method Show\Field|Collection price_id(string $label = null)
+     * @method Show\Field|Collection price(string $label = null)
+     * @method Show\Field|Collection price_type(string $label = null)
+     * @method Show\Field|Collection return_items_id(string $label = null)
+     * @method Show\Field|Collection return_num(string $label = null)
+     * @method Show\Field|Collection return_price(string $label = null)
+     * @method Show\Field|Collection return_amount(string $label = null)
      * @method Show\Field|Collection token(string $label = null)
      * @method Show\Field|Collection token(string $label = null)
+     * @method Show\Field|Collection post_code(string $label = null)
      * @method Show\Field|Collection is_default(string $label = null)
      * @method Show\Field|Collection is_default(string $label = null)
+     * @method Show\Field|Collection last_name(string $label = null)
+     * @method Show\Field|Collection first_name(string $label = null)
      * @method Show\Field|Collection user_sn(string $label = null)
      * @method Show\Field|Collection user_sn(string $label = null)
      * @method Show\Field|Collection email_verified_at(string $label = null)
      * @method Show\Field|Collection email_verified_at(string $label = null)
      * @method Show\Field|Collection account_properties(string $label = null)
      * @method Show\Field|Collection account_properties(string $label = null)
-     * @method Show\Field|Collection first_name(string $label = null)
-     * @method Show\Field|Collection last_name(string $label = null)
      * @method Show\Field|Collection created_time(string $label = null)
      * @method Show\Field|Collection created_time(string $label = null)
+     * @method Show\Field|Collection reg_source(string $label = null)
      * @method Show\Field|Collection config_id(string $label = null)
      * @method Show\Field|Collection config_id(string $label = null)
      * @method Show\Field|Collection config_title(string $label = null)
      * @method Show\Field|Collection config_title(string $label = null)
      * @method Show\Field|Collection config_schema(string $label = null)
      * @method Show\Field|Collection config_schema(string $label = null)
@@ -1277,7 +1362,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection local(string $label = null)
      * @method Show\Field|Collection local(string $label = null)
      * @method Show\Field|Collection mobile(string $label = null)
      * @method Show\Field|Collection mobile(string $label = null)
      * @method Show\Field|Collection num(string $label = null)
      * @method Show\Field|Collection num(string $label = null)
-     * @method Show\Field|Collection price(string $label = null)
      * @method Show\Field|Collection end_time(string $label = null)
      * @method Show\Field|Collection end_time(string $label = null)
      * @method Show\Field|Collection model_name(string $label = null)
      * @method Show\Field|Collection model_name(string $label = null)
      * @method Show\Field|Collection model_key(string $label = null)
      * @method Show\Field|Collection model_key(string $label = null)

resources/lang/en/country.php

+<?php
+return [
+    'labels' => [
+        'Country' => 'Country',
+        'country' => 'Country',
+    ],
+    'fields' => [
+    ],
+    'options' => [
+    ],
+];

resources/lang/en/menu.php

@@ -4,5 +4,6 @@ return [
     'titles' => [
     'titles' => [
         'userAddress' => 'UserAddress',
         'userAddress' => 'UserAddress',
         'inquiry' => 'Inquiry',
         'inquiry' => 'Inquiry',
+        'country' => 'Country',
     ],
     ],
 ];
 ];

resources/lang/zh_CN/country.php

+<?php
+return [
+    'labels' => [
+        'Country' => '国家/地区',
+        'country' => '国家/地区',
+    ],
+    'fields' => [
+        'name' => '名称',
+        'capital' => '首都',
+        'currency' => '币种',
+        'currency_name' => '币种名称',
+        'currency_symbol' => '币种符号',
+        'region' => '区域',
+        'subregion' => '亚区域',
+    ],
+    'options' => [
+    ],
+];

resources/lang/zh_CN/menu.php

@@ -15,6 +15,7 @@ return [
         'icons' => '图标',
         'icons' => '图标',
         'userAddress' => '用户地址',
         'userAddress' => '用户地址',
         'inquiry' => '询价管理',
         'inquiry' => '询价管理',
-        'task' => '任务管理'
+        'task' => '任务管理',
+        'country' => '地区管理',
     ],
     ],
 ];
 ];

resources/views/export/order_contract.blade.php

-<table>
-    <thead>
-        <tr>
-            <td colspan="9" style="text-align:center; font-size: 16px;">深圳市猎芯科技有限公司</td>
-        </tr>
-        <tr>
-            <td colspan="9" height="20" style="text-align:center; vertical-align: middle; font-size: 12px;">销售合同</td>
-        </tr>
-    </thead>
-    <tbody>
-        <tr style="margin-bottom: 5px; padding: 5px;">
-            <td colspan="9" style="text-align: right; border-bottom: 1px solid #ccc;">合同编号：xxxxxxx</td>
-        </tr>
-        <tr>
-            <td colspan="1">供方：</td>
-            <td colspan="3">深圳市猎芯科技有限公司</td>
-            <td colspan="1">需方：</td>
-            <td colspan="4">xxxx</td>
-        </tr>
-        <tr>
-            <td colspan="1">联系人：</td>
-            <td colspan="3">xxx</td>
-            <td colspan="1"></td>
-            <td colspan="4"></td>
-        </tr>
-        <tr>
-            <td colspan="1">联系方式：</td>
-            <td colspan="3" style="text-align: left;">xxxx</td>
-            <td colspan="1"></td>
-            <td colspan="4"></td>
-        </tr>
-        <tr>
-            <td colspan="1">合同明细：</td>
-            <td colspan="3"></td>
-            <td colspan="1"></td>
-            <td colspan="4" style="text-align: right;">签订日期：xxxx</td>
-        </tr>
-        <tr>
-            <th style="text-align: center; border: 1px solid #ccc;">序号</th>
-            <th style="text-align: center; border: 1px solid #ccc;">型号</th>
-            <th style="text-align: center; border: 1px solid #ccc;">品牌</th>
-            <th style="text-align: center; border: 1px solid #ccc;">批次</th>
-            <th style="text-align: center; border: 1px solid #ccc;">数量</th>
-            <th style="text-align: center; border: 1px solid #ccc;">单价</th>
-            <th style="text-align: center; border: 1px solid #ccc;">小计</th>
-            <th style="text-align: center; border: 1px solid #ccc;">货期</th>
-            <th style="text-align: center; border: 1px solid #ccc;">备注</th>
-        </tr>
-
-        <tr>
-            <td style="text-align: center; border: 1px solid #ccc;">商品总额：</td>
-            <td colspan="8" style="border: 1px solid #ccc;">xxxx</td>
-        </tr>
-        <tr>
-            <td style="text-align: center; border: 1px solid #ccc;">交货方式：</td>
-            <td colspan="8" style="border: 1px solid #ccc;">xxx</td>
-        </tr>
-        <tr>
-            <td style="text-align: center; border: 1px solid #ccc;">付款方式：</td>
-            <td style="border: 1px solid #ccc;">xxxx</td>
-            <td style="text-align: left;">预收金额：</td>
-            <td colspan="6" style="text-align: left; border: 1px solid #ccc;">xxx</td>
-        </tr>
-        <tr>
-            <td style="text-align: center; border: 1px solid #ccc;">备注：</td>
-            <td colspan="8" style="border: 1px solid #ccc;">含增值税13%</td>
-        </tr>
-        <tr>
-            <td colspan="9">条款：</td>
-        </tr>
-        <tr>
-            <td colspan="9">
-                1、订货均以该合同中的型号和最终数量为准，若有特殊要求，务必在备注中说明，否则不予以退、换货。
-            </td>
-        </tr>
-        <tr height="35">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                2、供方部分渠道数据为合作供应商提供，数据更新可能发生延迟，订单执行过程中可能会发生合作供应商的库存，价格，交期等变动，当发生上述变动时，供方应尽最大的努力与合作供应商协商解决，若协商无果或出现缺货、无货等情况时，供方应及时通知需方解除合同，预付款订单退回需方已支付的预付款，但供方不承担由此导致的任何直接和间接损失。
-            </td>
-        </tr>
-        <tr height="35">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                3、针对预付款订单，需方支付预付款后，需在接到供方到货通知后的5个工作日内付清尾款并提货，尾款超期未支付视为需方自动放弃订单，预付款不予退还且因此导致供方产生的损失及相关费用由需方承担。尾款付清后需在一周内提货，逾期不提货视为客户自动放弃货物，供方将有权自行处理货物，货款不予退还。
-            </td>
-        </tr>
-        <tr height="25">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                4、因货源出口国对产品出口的限制政策和相关税费调整而产生的交易价格变动、资料审查延期或订单取消等状况，供方不承担由此而导致的任何直接和间接经济损失。因国家法律法规的颁布实施而造成的相关税费调整，需方应补齐需缴纳的费用。
-            </td>
-        </tr>
-        <tr>
-            <td colspan="9">
-                5、海外订购的商品，若需方所订购的货品在运输时被确认超重，需方应补缴因超重而多出的费用。
-            </td>
-        </tr>
-        <tr height="35">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                6、交货方式为自提或者快递。自提需到供方指定地点。如是境内交易，供方承担中国境内的基础快递费用。如香港交易，供方承担香港本地快递配送的基础费用。如超出此配送范围而产生的费用，由需方承担。供方对单笔订单原则上只发货一次，且发货日期按最后交货的供应商交货日期计算。若需方要求分批发货或超重而产生的额外费用，需方自行承担。
-            </td>
-        </tr>
-        <tr>
-            <td colspan="9">
-                7、需方应妥善保留好货物外包装上的所有标签，如有退换货等售后事宜，将以此作为唯一依据。
-            </td>
-        </tr>
-        <tr height="45">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                8、供方保证所供产品皆为原厂正品。需方收到货后，应在一周内对货物的外观、数量、型号、质量等进行检验，逾期未提出异议的视为默认验收合格。对于交货产品数量不符，明显外观不良等问题，需方应在收货后一周内提出，逾期供方将不予受理。需方如对交货产品质量存有异议，应在收货后30天内提出，并向供方提供第三方权威检测机构的检测报告，逾期或者未按照规定提交售后的，供方将不予受理。若商品最终确定存在质量问题，供方需负责更换合格产品或者执行退货；若证实无质量问题，需方必须执行完本合同。
-            </td>
-        </tr>
-        <tr height="25">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                9、根据法律规定和合作商的明确要求，属于NCNR(不可取消不可退换）的型号即使发生延期交付，数量变动等情况，供方同样不接受退换货请求。
-            </td>
-        </tr>
-        <tr height="35">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                10、合同条款及其交易说明（包括其他所有附件等）也经我公司详细阐述并合理解释；且由于交易标的的特殊性，双方均完全理解并认可其中可能存在限制一方责任，或免除和减少一方责任的条款，并对此均不持异议。本合同涉及的法律，行政法规，供需双方均已知悉并了解，且已明确各自的权利和义务。本合同签订过程中，不存在欺诈，重大误解和显失公平等情形。
-            </td>
-        </tr>
-        <tr height="48">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                11、本合同经双方签字或盖章（包含电子章）后立即生效，合同生效后双方均应严格按照合同约定履行，非因不可抗力，需方不能解除或终止合同。如因需方原因不再履行本合同，需方提出请求后供方可以协助处理，如产生费用由需方自行承担，如供应商原因或其他原因导致无法退货的，需方仍应该履行本合同并支付合同全款，否则需方要承担由此给供方造成的一切损失。且需方应在接到供方到货通知后的一周内提货。
-            </td>
-        </tr>
-        <tr height="35">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                12、本合同一式两份，双方各执一份，其复印件、传真件具有同等法律效力；因本合同引起的或与本合同有关的任何争议，双方尽量友好协商解决，如协商不成，双方一致同意提请深圳国际仲裁院按照其仲裁规则进行仲裁。仲裁地点在深圳，仲裁裁决是终局的，对协议各方均有约束力。仲裁费、保全费以及律师费等相关费用由败诉方承担。
-            </td>
-        </tr>
-        <tr height="35">
-            <td colspan="9" style="word-wrap: break-word; word-break: break-all;">
-                13、为遵循美国ECCN出口管制相关规定，本公司所有交易的电子元器件禁止出货给美国实体清单国家或企业，请用户在相关流通环节务必遵循美国实体清单的相关规定，对于违反美国实体清单规定的用户，本公司有权随时取消合作，如因违反相关规定导致的后果由用户自行承担且与本公司无关。
-            </td>
-        </tr>
-        <tr>
-            <td colspan="9" style="border-bottom: 1px solid #ccc;"></td>
-        </tr>
-        <tr>
-            <td colspan="4">供方</td>
-            <td colspan="5">需方</td>
-        </tr>
-        <tr>
-            <td>公司名称：</td>
-            <td colspan="3">深圳市猎芯科技有限公司</td>
-            <td>公司名称：</td>
-            <td colspan="4">xxxx</td>
-        </tr>
-        <tr>
-            <td>开户行：</td>
-            <td colspan="3">交通银行股份有限公司深圳梅林支行</td>
-            <td>单位地址：</td>
-            <td colspan="4">xxxx</td>
-        </tr>
-        <tr>
-            <td>账号：</td>
-            <td colspan="3">4438 9999 1010 0035 1176 4</td>
-            <td>电话：</td>
-            <td colspan="4" style="text-align: left;">xxxx</td>
-        </tr>
-        <tr>
-            <td>公司地址：</td>
-            <td colspan="3">深圳市龙岗区坂田街道清丽路1号宝能科技园12栋11楼</td>
-            <td>传真：</td>
-            <td colspan="4" style="text-align: left;">xx</td>
-        </tr>
-        <tr>
-            <td></td>
-            <td colspan="3"></td>
-            <td>联系人：</td>
-            <td colspan="4" style="text-align: left;">xxxx</td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file

resources/views/export/order_contract_CI.blade.php

+我是Pi文件
+<table>
+    <thead>
+    <tr height="12">
+        <td rowspan="2" colspan="4" style="font-size: 16px;"><b>深貿電子有限公司</b></td>
+        <td colspan="4">香港九龙观塘成业街27号日昇中心12楼1210室</td>
+    </tr>
+    <tr height="12">
+        <td colspan="4">Flat Rm1210, 10/F Sunbeam Centre #27, Shing Yip Street, Kwun </td>
+    </tr>
+    <tr height="12">
+        <td colspan="4" style="font-size: 12px;"><b>SEMOUR ELECTRONICS CO., LIMITED</b></td>
+        <td colspan="4">Tong, Kowloon Hong Kong</td>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td colspan="8" style="text-align: center; font-size: 16px;"><b>PROFORMA INVOICE</b></td>
+    </tr>
+    <tr>
+        <td colspan="4">
+            Bill To: xxxxxxxxxxxx
+        </td>
+        <td colspan="4">
+            Invoice No.:  xxxxxxxxxxxx
+        </td>
+    </tr>
+    <tr>
+        <td colspan="4"></td>
+        <td colspan="4">Date:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Ship To:  xxxxxxxxxxxx</td>
+        <td colspan="4">Payment Term:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4"></td>
+        <td colspan="4">Delivery terms: EXW HK </td>
+    </tr>
+    <tr>
+        <td colspan="4">Add:</td>
+        <td colspan="4">SELLER /CONTACT:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Tel: </td>
+        <td colspan="4">Email:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Attn:</td>
+        <td colspan="4">Mob:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>C/N No.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Description / Part No.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Mfr.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Quantity</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Unit Price</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Date code</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Lead Time</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>AMOUNT</b></th>
+    </tr>
+
+
+    <tr height="25">
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc;"> xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;"> xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+    </tr>
+
+
+    <tr>
+        <td style="text-align: center; border: 1px solid #ccc;"><b>Total:</b></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;">xxxxxxxxxxxx</td>
+    </tr>
+    <tr height="25">
+        <td colspan="8" style="word-wrap: break-word; word-break: break-all;">
+            Remark:  1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            2.All bank fees are the responsibility of the customer.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8"></td>
+    </tr>
+    <tr>
+        <td style="border-bottom: 1px solid #ccc;">Bank Information</td>
+        <td colspan="7"></td>
+    </tr>
+    <tr>
+        <td>Bank Name</td>
+        <td colspan="7">HSBC Hong Kong</td>
+    </tr>
+    <tr>
+        <td>Bank address</td>
+        <td colspan="7">1 Queen's Road Central, Hong Kong</td>
+    </tr>
+    <tr>
+        <td>Swift Code</td>
+        <td colspan="7">HSBCHKHHHKH</td>
+    </tr>
+    <tr>
+        <td>Company Name</td>
+        <td colspan="7">SEMOUR ELECTRONICS CO., LIMITED</td>
+    </tr>
+    <tr>
+        <td>Account No</td>
+        <td colspan="7">819-847187-838</td>
+    </tr>
+    <tr>
+        <td colspan="8"></td>
+    </tr>
+    <tr>
+        <td style="border-bottom: 1px solid #ccc;">Terms &#38; Conditions</td>
+        <td colspan="7"></td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            1.Your order is NCNR.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            2.All Claims of shortage or shipment errors or shipment damage must be made within 7 days of after delivery.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            3.Our liability shall be limited to the invoiced value of the materials or its replacement.
+        </td>
+    </tr>
+    <tr height="25">
+        <td colspan="8" style="word-wrap: break-word; word-break: break-all;">
+            4.Parts are warranty one month form, fit, and function guarantee. All returns must be authorized by our sales department within one month of receipts of shipment.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            5.VAT and Bank transfer charger is excluded in the invoice amount. Buyer will be responsible for TAX and Bank Charges if there is any.
+        </td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file

resources/views/export/order_contract_PI.blade.php

+我是Pi文件
+<table>
+    <thead>
+    <tr height="12">
+        <td rowspan="2" colspan="4" style="font-size: 16px;"><b>深貿電子有限公司</b></td>
+        <td colspan="4">香港九龙观塘成业街27号日昇中心12楼1210室</td>
+    </tr>
+    <tr height="12">
+        <td colspan="4">Flat Rm1210, 10/F Sunbeam Centre #27, Shing Yip Street, Kwun </td>
+    </tr>
+    <tr height="12">
+        <td colspan="4" style="font-size: 12px;"><b>SEMOUR ELECTRONICS CO., LIMITED</b></td>
+        <td colspan="4">Tong, Kowloon Hong Kong</td>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td colspan="8" style="text-align: center; font-size: 16px;"><b>PROFORMA INVOICE</b></td>
+    </tr>
+    <tr>
+        <td colspan="4">
+            Bill To: xxxxxxxxxxxx
+        </td>
+        <td colspan="4">
+            Invoice No.:  xxxxxxxxxxxx
+        </td>
+    </tr>
+    <tr>
+        <td colspan="4"></td>
+        <td colspan="4">Date:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Ship To:  xxxxxxxxxxxx</td>
+        <td colspan="4">Payment Term:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4"></td>
+        <td colspan="4">Delivery terms: EXW HK </td>
+    </tr>
+    <tr>
+        <td colspan="4">Add:</td>
+        <td colspan="4">SELLER /CONTACT:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Tel: </td>
+        <td colspan="4">Email:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Attn:</td>
+        <td colspan="4">Mob:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>C/N No.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Description / Part No.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Mfr.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Quantity</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Unit Price</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Date code</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Lead Time</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>AMOUNT</b></th>
+    </tr>
+
+
+    <tr height="25">
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc;"> xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;"> xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+    </tr>
+
+
+    <tr>
+        <td style="text-align: center; border: 1px solid #ccc;"><b>Total:</b></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;">xxxxxxxxxxxx</td>
+    </tr>
+    <tr height="25">
+        <td colspan="8" style="word-wrap: break-word; word-break: break-all;">
+            Remark:  1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            2.All bank fees are the responsibility of the customer.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8"></td>
+    </tr>
+    <tr>
+        <td style="border-bottom: 1px solid #ccc;">Bank Information</td>
+        <td colspan="7"></td>
+    </tr>
+    <tr>
+        <td>Bank Name</td>
+        <td colspan="7">HSBC Hong Kong</td>
+    </tr>
+    <tr>
+        <td>Bank address</td>
+        <td colspan="7">1 Queen's Road Central, Hong Kong</td>
+    </tr>
+    <tr>
+        <td>Swift Code</td>
+        <td colspan="7">HSBCHKHHHKH</td>
+    </tr>
+    <tr>
+        <td>Company Name</td>
+        <td colspan="7">SEMOUR ELECTRONICS CO., LIMITED</td>
+    </tr>
+    <tr>
+        <td>Account No</td>
+        <td colspan="7">819-847187-838</td>
+    </tr>
+    <tr>
+        <td colspan="8"></td>
+    </tr>
+    <tr>
+        <td style="border-bottom: 1px solid #ccc;">Terms &#38; Conditions</td>
+        <td colspan="7"></td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            1.Your order is NCNR.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            2.All Claims of shortage or shipment errors or shipment damage must be made within 7 days of after delivery.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            3.Our liability shall be limited to the invoiced value of the materials or its replacement.
+        </td>
+    </tr>
+    <tr height="25">
+        <td colspan="8" style="word-wrap: break-word; word-break: break-all;">
+            4.Parts are warranty one month form, fit, and function guarantee. All returns must be authorized by our sales department within one month of receipts of shipment.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            5.VAT and Bank transfer charger is excluded in the invoice amount. Buyer will be responsible for TAX and Bank Charges if there is any.
+        </td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file

resources/views/export/order_contract_PL.blade.php

+我是Pi文件
+<table>
+    <thead>
+    <tr height="12">
+        <td rowspan="2" colspan="4" style="font-size: 16px;"><b>深貿電子有限公司</b></td>
+        <td colspan="4">香港九龙观塘成业街27号日昇中心12楼1210室</td>
+    </tr>
+    <tr height="12">
+        <td colspan="4">Flat Rm1210, 10/F Sunbeam Centre #27, Shing Yip Street, Kwun </td>
+    </tr>
+    <tr height="12">
+        <td colspan="4" style="font-size: 12px;"><b>SEMOUR ELECTRONICS CO., LIMITED</b></td>
+        <td colspan="4">Tong, Kowloon Hong Kong</td>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td colspan="8" style="text-align: center; font-size: 16px;"><b>PROFORMA INVOICE</b></td>
+    </tr>
+    <tr>
+        <td colspan="4">
+            Bill To: xxxxxxxxxxxx
+        </td>
+        <td colspan="4">
+            Invoice No.:  xxxxxxxxxxxx
+        </td>
+    </tr>
+    <tr>
+        <td colspan="4"></td>
+        <td colspan="4">Date:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Ship To:  xxxxxxxxxxxx</td>
+        <td colspan="4">Payment Term:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4"></td>
+        <td colspan="4">Delivery terms: EXW HK </td>
+    </tr>
+    <tr>
+        <td colspan="4">Add:</td>
+        <td colspan="4">SELLER /CONTACT:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Tel: </td>
+        <td colspan="4">Email:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <td colspan="4">Attn:</td>
+        <td colspan="4">Mob:  xxxxxxxxxxxx</td>
+    </tr>
+    <tr>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>C/N No.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Description / Part No.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Mfr.</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Quantity</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Unit Price</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Date code</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>Lead Time</b></th>
+        <th style="text-align: center; border: 1px solid #ccc;"><b>AMOUNT</b></th>
+    </tr>
+
+
+    <tr height="25">
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc;"> xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;"> xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; vertical-align: top; border: 1px solid #ccc; word-wrap: break-word; word-break: break-all;">xxxxxxxxxxxx</td>
+    </tr>
+
+
+    <tr>
+        <td style="text-align: center; border: 1px solid #ccc;"><b>Total:</b></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;">xxxxxxxxxxxx</td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;"></td>
+        <td style="text-align: center; border: 1px solid #ccc;">xxxxxxxxxxxx</td>
+    </tr>
+    <tr height="25">
+        <td colspan="8" style="word-wrap: break-word; word-break: break-all;">
+            Remark:  1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            2.All bank fees are the responsibility of the customer.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8"></td>
+    </tr>
+    <tr>
+        <td style="border-bottom: 1px solid #ccc;">Bank Information</td>
+        <td colspan="7"></td>
+    </tr>
+    <tr>
+        <td>Bank Name</td>
+        <td colspan="7">HSBC Hong Kong</td>
+    </tr>
+    <tr>
+        <td>Bank address</td>
+        <td colspan="7">1 Queen's Road Central, Hong Kong</td>
+    </tr>
+    <tr>
+        <td>Swift Code</td>
+        <td colspan="7">HSBCHKHHHKH</td>
+    </tr>
+    <tr>
+        <td>Company Name</td>
+        <td colspan="7">SEMOUR ELECTRONICS CO., LIMITED</td>
+    </tr>
+    <tr>
+        <td>Account No</td>
+        <td colspan="7">819-847187-838</td>
+    </tr>
+    <tr>
+        <td colspan="8"></td>
+    </tr>
+    <tr>
+        <td style="border-bottom: 1px solid #ccc;">Terms &#38; Conditions</td>
+        <td colspan="7"></td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            1.Your order is NCNR.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            2.All Claims of shortage or shipment errors or shipment damage must be made within 7 days of after delivery.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            3.Our liability shall be limited to the invoiced value of the materials or its replacement.
+        </td>
+    </tr>
+    <tr height="25">
+        <td colspan="8" style="word-wrap: break-word; word-break: break-all;">
+            4.Parts are warranty one month form, fit, and function guarantee. All returns must be authorized by our sales department within one month of receipts of shipment.
+        </td>
+    </tr>
+    <tr>
+        <td colspan="8">
+            5.VAT and Bank transfer charger is excluded in the invoice amount. Buyer will be responsible for TAX and Bank Charges if there is any.
+        </td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file

vendor/composer/autoload_files.php

@@ -35,4 +35,5 @@ return array(
     'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
     'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
     '044fc72df35e84c745ee0d4120dc15d2' => $vendorDir . '/dcat/laravel-admin/src/Support/helpers.php',
     '044fc72df35e84c745ee0d4120dc15d2' => $vendorDir . '/dcat/laravel-admin/src/Support/helpers.php',
     'b670c7ffff63265cc064eb6fd1051ae1' => $vendorDir . '/mosiboom/dcat-iframe-tab/src/helpers.php',
     'b670c7ffff63265cc064eb6fd1051ae1' => $vendorDir . '/mosiboom/dcat-iframe-tab/src/helpers.php',
+    'b4e3f29b106af37a2bb239f73cdf68c7' => $baseDir . '/app/helpers.php',
 );
 );

vendor/composer/autoload_static.php

@@ -36,6 +36,7 @@ class ComposerStaticInit14b314507a533a1b9e8248f4361c62bf
         'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
         'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
         '044fc72df35e84c745ee0d4120dc15d2' => __DIR__ . '/..' . '/dcat/laravel-admin/src/Support/helpers.php',
         '044fc72df35e84c745ee0d4120dc15d2' => __DIR__ . '/..' . '/dcat/laravel-admin/src/Support/helpers.php',
         'b670c7ffff63265cc064eb6fd1051ae1' => __DIR__ . '/..' . '/mosiboom/dcat-iframe-tab/src/helpers.php',
         'b670c7ffff63265cc064eb6fd1051ae1' => __DIR__ . '/..' . '/mosiboom/dcat-iframe-tab/src/helpers.php',
+        'b4e3f29b106af37a2bb239f73cdf68c7' => __DIR__ . '/../..' . '/app/helpers.php',
     );
     );
 
 
     public static $prefixLengthsPsr4 = array (
     public static $prefixLengthsPsr4 = array (