Merge branch 'master' into ysx-供应商新建-20220701

config/field.php

@@ -170,6 +170,7 @@ return [
         "HYPERNET TECHNOLOGY (HONGKONG) CO.,LIMITED",
         "CHIP ONE STOP (HONG KONG) LIMITED",
         "RS COMPONENTS LIMITED",
+        "FUTURE ELECTRONICS (HONG KONG) LIMITED",
     ],
     'CompanyNature' => [
         '其它' => '其它',

resources/views/web/SupplierDetail.blade.php

@@ -128,7 +128,7 @@
                                 <span class="required_field">*</span>供应商类别 ：{{$supplier['supplier_type_name']}}
                             </div>
                             <div class="layui-row">
-                                注册公司名 ：{{$supplier['supplier_name']}}
+                                注册公司名 ：{{$supplier['register_company_name']}}
                             </div>
                             <div class="layui-row">
                                 供应商英文名称 ：{{$supplier['supplier_name_en']}}

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

@@ -91,14 +91,14 @@
                 <label class="layui-form-label">注册公司名 : </label>
                 <div class="layui-input-block">
                     <input type="text" name="register_company_name" id="register_company_name"
-                           placeholder="请输入注册公司名,注册公司名必须同执照" class="layui-input" value="">
+                           placeholder="请输入注册公司名,注册公司名必须同执照" class="layui-input" value="{{$supplier['register_company_name']}}">
                 </div>
             </div>
             <div class="layui-col-md5">
                 <label class="layui-form-label">英文名称 : </label>
                 <div class="layui-input-block">
                     <input type="text" name="supplier_name_en" id="supplier_name_en"
-                           placeholder="请输入供应商英文名称" class="layui-input" value="">
+                           placeholder="请输入供应商英文名称" class="layui-input" value="{{$supplier['supplier_name_en']}}">
                 </div>
             </div>
         </div>