Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_domestic_20201110

app/Http/Controllers/OrderController.php

@@ -442,6 +442,7 @@ Class OrderController extends Controller
         $map['order_type_extend']    = $request->input('order_type_extend', '');
         $map['order_type_extend']    = $request->input('order_type_extend', '');
         $map['status_extend']        = $request->input('status_extend', '');
         $map['status_extend']        = $request->input('status_extend', '');
         $map['is_manager_audit']     = $request->input('is_manager_audit', '');
         $map['is_manager_audit']     = $request->input('is_manager_audit', '');
+        $map['order_remark']         = $request->input('order_remark', '');
 
 
         $perm = new PermController;
         $perm = new PermController;
 
 
@@ -924,6 +925,8 @@ Class OrderController extends Controller
                                 'brand_name' => $v['brand_name'],
                                 'brand_name' => $v['brand_name'],
                             );
                             );
 
 
+                            $v['goods_id'] && $data['goods_id'] = $v['goods_id'];
+
                             $res = $client->SelfGoodsInfo(json_encode($data));
                             $res = $client->SelfGoodsInfo(json_encode($data));
                             if (!$res) return ['errcode'=>-1, 'errmsg'=>'请求基石库存接口失败'];
                             if (!$res) return ['errcode'=>-1, 'errmsg'=>'请求基石库存接口失败'];
 
 

public/js/list.js

@@ -97,6 +97,7 @@
                     order_type_extend    = $('#order_type_extend').val() ? $('#order_type_extend').val() : '',
                     order_type_extend    = $('#order_type_extend').val() ? $('#order_type_extend').val() : '',
                     status_extend        = $('#status_extend').val() ? $('#status_extend').val() : '',
                     status_extend        = $('#status_extend').val() ? $('#status_extend').val() : '',
                     is_manager_audit     = $('#is_manager_audit').val() ? $('#is_manager_audit').val() : '';
                     is_manager_audit     = $('#is_manager_audit').val() ? $('#is_manager_audit').val() : '';
+                    order_remark         = $('#order_remark').val() ? $('#order_remark').val() : '';
                    
                    
                     if (url == '/export') {
                     if (url == '/export') {
                         if (type == 1) { // 联营
                         if (type == 1) { // 联营
@@ -238,6 +239,10 @@
                         listUrl += '&test_order=' + 1;
                         listUrl += '&test_order=' + 1;
                     }
                     }
 
 
+                    if (order_remark) {
+                        listUrl += '&order_remark=' + order_remark;
+                    }
+
                     if (url == '/export') {
                     if (url == '/export') {
                         listUrl += '&order_goods_type='+type;
                         listUrl += '&order_goods_type='+type;
                     }
                     }

resources/views/orderlist/content.blade.php

@@ -80,8 +80,6 @@
                                     </dd>
                                     </dd>
                                 </dl>        
                                 </dl>        
 
 
-                               
-
                                 <dl>
                                 <dl>
                                     <dt>付款类型：</dt>
                                     <dt>付款类型：</dt>
                                     <dd>
                                     <dd>
@@ -229,6 +227,14 @@
                                         </select>
                                         </select>
                                     </dd>
                                     </dd>
                                 </dl>
                                 </dl>
+                                @if ($username == 'vpadmin@ichunt.com')
+                                <dl>
+                                    <dt>公司名称：</dt>
+                                    <dd>
+                                        <input type="text" id="order_remark" name="order_remark" value="{{$condition['order_remark']}}" placeholder="请输入公司名称">
+                                    </dd>
+                                </dl>
+                                @endif
                                 
                                 
                                 @if (in_array('check_test_order', $userPerms))
                                 @if (in_array('check_test_order', $userPerms))
                                     <dl>
                                     <dl>