Merge branch 'ysx-供应商财务信息增加中转行-20241125'

app/Http/Controllers/Api/SupplierApiController.php

@@ -149,6 +149,7 @@ class SupplierApiController extends Controller
             'certificate',
             'certificate',
             'swift_code',
             'swift_code',
             'nation_id',
             'nation_id',
+            'intermediary_bank',
         ]);
         ]);
         $channel = $request->only($channelMap);
         $channel = $request->only($channelMap);
 
 

app/Http/Controllers/Api/SupplierReceiptApiController.php

@@ -62,6 +62,7 @@ class SupplierReceiptApiController extends Controller
             'account_name',
             'account_name',
             'remark',
             'remark',
             'nation_id',
             'nation_id',
+            'intermediary_bank',
             //'international_code'
             //'international_code'
         ]);
         ]);
         $receipt = array_map('trim', $receipt);
         $receipt = array_map('trim', $receipt);

app/Http/Services/SupplierService.php

@@ -141,6 +141,7 @@ class SupplierService
                     'certificate',
                     'certificate',
                     'swift_code',
                     'swift_code',
                     'nation_id',
                     'nation_id',
+                    'intermediary_bank',
                 ];
                 ];
                 $receiptData = array_only($channel, $receiptField);
                 $receiptData = array_only($channel, $receiptField);
                 $channel = array_except($channel, $receiptField);
                 $channel = array_except($channel, $receiptField);

app/Http/Services/SyncSupplierService.php

@@ -102,7 +102,8 @@ class SyncSupplierService
                     'bankAddress' => $address,
                     'bankAddress' => $address,
                     'infoEvidence' => $receipt['certificate'],
                     'infoEvidence' => $receipt['certificate'],
                     'recid' => $receipt['receipt_id'],
                     'recid' => $receipt['receipt_id'],
-                    //'bankaccount' => $receipt['international_code'],
+                    'intermediaryBank' => $receipt['intermediary_bank'],
+                    'remark' => $receipt['remark'],
                 ];
                 ];
             }
             }
         }
         }

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

@@ -49,6 +49,7 @@
                         return data.nation ? data.nation.name_cn : '';
                         return data.nation ? data.nation.name_cn : '';
                     }
                     }
                 },
                 },
+                {field: 'intermediary_bank', title: '中转行', align: 'center', width: 150},
                 {field: 'remark', title: '备注', align: 'center', width: 200},
                 {field: 'remark', title: '备注', align: 'center', width: 200},
             ]],
             ]],
             id: 'receiptList',
             id: 'receiptList',

resources/views/web/AddSupplier.blade.php

@@ -355,6 +355,14 @@
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-col-md4">
                 <div class="layui-col-md4">
+                    <label class="layui-form-label">中转行 : </label>
+                    <div class="layui-input-block block-42">
+                        <input type="text" name="intermediary_bank" id="intermediary_bank"
+                               placeholder="请输入中转行" class="layui-input"
+                               value="">
+                    </div>
+                </div>
+                <div class="layui-col-md4">
                     <label class="layui-form-label">备注 : </label>
                     <label class="layui-form-label">备注 : </label>
                     <div class="layui-input-block block-42">
                     <div class="layui-input-block block-42">
                         <input type="text" name="remark" id="remark"
                         <input type="text" name="remark" id="remark"
@@ -362,7 +370,7 @@
                                value="">
                                value="">
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-col-md12">
+                <div class="layui-col-md8">
                     <label class="layui-form-label">
                     <label class="layui-form-label">
                         <span class="require">*</span>银行凭证：
                         <span class="require">*</span>银行凭证：
                     </label>
                     </label>

resources/views/web/AddSupplierReceipt.blade.php

@@ -98,6 +98,14 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="layui-form-item">
             <div class="layui-form-item">
+                <label class="layui-form-label">中转行 : </label>
+                <div class="layui-input-block block-42">
+                    <input type="text" name="intermediary_bank" id="intermediary_bank"
+                           placeholder="请输入中转行" class="layui-input"
+                           value="{{$receipt['intermediary_bank'] or ''}}">
+                </div>
+            </div>
+            <div class="layui-form-item">
                 <label class="layui-form-label">备注 : </label>
                 <label class="layui-form-label">备注 : </label>
                 <div class="layui-input-block block-42">
                 <div class="layui-input-block block-42">
                     <input type="text" name="remark" id="remark"
                     <input type="text" name="remark" id="remark"