附件问题

app/Http/Controllers/Api/SupplierApiController.php

@@ -123,6 +123,7 @@ class SupplierApiController extends Controller
             'field_name',
             'validity_type',
             'validity_period',
+            'description',
             //银行信息
             'receipt_type',
             'bank_name',

app/Http/Services/SupplierAttachmentService.php

@@ -62,7 +62,7 @@ class SupplierAttachmentService
                 $item = array_values($item);
             }
             return $item;
-        },$attachmentData);
+        }, $attachmentData);
         if (empty($attachmentData)) {
             return true;
         }
@@ -80,12 +80,16 @@ class SupplierAttachmentService
                 'validity_type' => $attachmentData['validity_type'][$key],
                 'create_uid' => request()->user->userId,
                 'create_name' => request()->user->name,
+                'description' => $attachmentData['description'][$key],
                 'type_name' => array_get(config('fixed.FileNameMapping'), $attachmentData['field_name'][$key]),
             ];
             if (!empty($attachmentData['validity_period'][$key])) {
                 $validityPeriod = explode('~', $attachmentData['validity_period'][$key]);
                 $attachment['validity_start'] = strtotime(trim($validityPeriod[0]));
                 $attachment['validity_end'] = strtotime(trim($validityPeriod[1]));
+            } else {
+                $attachment['validity_start'] = 0;
+                $attachment['validity_end'] = 0;
             }
             $attachments[] = $attachment;
         }

app/Http/Services/SupplierService.php

@@ -89,6 +89,7 @@ class SupplierService
                     'field_name',
                     'validity_type',
                     'validity_period',
+                    'description',
                 ];
                 $attachmentData = array_only($channel, $attachmentField);
                 $channel = array_except($channel, $attachmentField);

app/Http/Validators/SupplierValidator.php

@@ -44,6 +44,7 @@ class SupplierValidator
             'supplier_type' => 'required',
             'supplier_name' => 'required',
             'legal_representative' => 'required',
+            'supplier_address' => 'required',
             'stockup_type' => 'required',
             'main_brands' => 'required',
             'pay_type' => 'required',

resources/views/script/supplier/SupplierFileScript.blade.php

@@ -24,7 +24,7 @@
 
         form.on('select(validity_period_selector)', function (data) {
             fileType = data.value;
-            let validityPeriodTimeSelector = $(this).parents('.layui-col-md7')
+            let validityPeriodTimeSelector = $(this).parents('.validity_period_selector_div')
                 .find('.validity_period');
             if (data.value === '1') {
                 validityPeriodTimeSelector.attr('disabled', true);

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

@@ -51,7 +51,7 @@
                 <input type="hidden" id="field_name">
             </div>
         </div>
-        <div class="layui-col-md5">
+        <div class="layui-col-md4 validity_period_selector_div">
             <label class="layui-form-label">有效期 : </label>
             <div class="layui-input-inline" style="width: 100px">
                 <select id="validity_type"  lay-filter="validity_period_selector">
@@ -59,14 +59,14 @@
                     <option value="2">自定义</option>
                 </select>
             </div>
-            <div class="layui-input-inline" style="width: 300px">
+            <div class="layui-input-inline" style="width: 200px">
                 <input type="text" id="validity_period"
                        placeholder="请选择时间区间" autocomplete="off" class="" disabled>
             </div>
         </div>
-        <div class="layui-col-md4">
+        <div class="layui-col-md5">
             <label class="layui-form-label">附件说明 :</label>
-            <div class="layui-input-block block-42">
+            <div class="layui-input-inline" style="width: 300px">
                 <input type="text" id="description"
                        placeholder="附件说明" class="layui-input"
                        value="">