注册资金校验

app/Http/Validators/SupplierValidator.php

@@ -9,6 +9,7 @@ use App\Model\SupplierAttachmentsModel;
 use App\Model\SupplierChannelModel;
 use App\Model\SupplierChannelModel;
 use App\Model\SupplierContactModel;
 use App\Model\SupplierContactModel;
 use App\Model\SupplierReceiptModel;
 use App\Model\SupplierReceiptModel;
+use Carbon\Carbon;
 use Validator;
 use Validator;
 
 
 class SupplierValidator
 class SupplierValidator
@@ -124,6 +125,16 @@ class SupplierValidator
             'is_business_abnormal' => 'required',
             'is_business_abnormal' => 'required',
             'phone' => 'required',
             'phone' => 'required',
         ];
         ];
+
+        //2022年6月30日（含）之前新建的供应商，在修改供应商信息时，可跳过“注册资金”这一必填项
+        if (!$isAdd) {
+            $supplier = SupplierChannelModel::where('supplier_id', $validateData['supplier_id'])
+                ->first()->toArray();
+            if ($supplier['create_time'] < Carbon::createFromDate('2022-06-30')->timestamp) {
+                $rules['registered_capital'] = '';
+            }
+        }
+
         $contactRuler = [
         $contactRuler = [
             'supplier_consignee' => 'required|max:50',
             'supplier_consignee' => 'required|max:50',
             'supplier_mobile' => 'required|max:30',
             'supplier_mobile' => 'required|max:30',

resources/views/web/SupplierDetail.blade.php

@@ -230,7 +230,10 @@
                                     结算方式 ：{{$supplier['settlement_type_name']}}
                                     结算方式 ：{{$supplier['settlement_type_name']}}
                                 </div>
                                 </div>
                                 <div class="layui-col-md3">
                                 <div class="layui-col-md3">
-                                    付款周期 ：{{$supplier['pay_type_name']}}
+                                    付款周期 ：{{$supplier['pay_type_name'] }}
+                                    @if($supplier['pay_type'] == 1)
+                                         (月结{{$supplier['pay_type_value'].$supplier['pay_type_extra']}})
+                                    @endif
                                 </div>
                                 </div>
                             </div>
                             </div>
                             <hr/>
                             <hr/>