联营批量导入添加标准品牌

app/Http/Controllers/AddOrderController.php

@@ -754,6 +754,7 @@ Class AddOrderController extends Controller
         // 推送到API
         $data['data']           = $excel;
         $data['operator_id']    = $request->user->userId;
+        $data['operator_name']  = $request->user->name;
         $data['type']           = 3; // 后台批量添加标记
         $data['uid']            = $request->input('user_id'); 
         $data['delivery_place'] = $request->input('delivery_place'); 
@@ -825,6 +826,11 @@ Class AddOrderController extends Controller
                     return;
                 }
 
+                if ($type == 1 && !$val['standard_brand_name']) {
+                    $err[] = '第'.$key.'行，标准品牌不能为空';
+                    return;
+                }
+
                 if ($val['num'] <= 0) {
                     $err[] = '第'.$key.'行，商品数量等于或小于0';
                     return;

config/params.php

@@ -53,14 +53,15 @@
 		'joint_map' => [
 			0 => 'goods_name',
 			1 => 'brand_name',
-			2 => 'num',
-			3 => 'goods_price',
-			4 => 'delivery_time',
-			5 => 'supplier_name',
-			6 => 'id',
-			7 => 'buyer_id',
-			8 => 'remarks',
-			9 => 'batch',
+			2 => 'standard_brand_name',
+			3 => 'num',
+			4 => 'goods_price',
+			5 => 'delivery_time',
+			6 => 'supplier_name',
+			7 => 'id',
+			8 => 'buyer_id',
+			9 => 'remarks',
+			10 => 'batch',
 		],
 
 		'self_map' => [

public/js/add_order.js

@@ -650,7 +650,7 @@
                             },
                         })
 
-                        layer.msg('批量导入中...', {icon: 16, time: 0, shade: 0.3});
+                        // layer.msg('批量导入中...', {icon: 16, time: 0, shade: 0.3});
                     })
 
                     form.find('input[type="file"]').trigger('click');