Selaa lähdekoodia

订单管理 页面 自动填充

ajun 4 vuotta sitten
vanhempi
commit
cc8eba3165

+ 10 - 10
app/Filters/OrderIssueFilters.php

@@ -36,7 +36,7 @@ class OrderIssueFilters
         'log_content',
         'is_imported',
         'is_new_rejecting',
-        'logistic_id',
+        'logistic',
         'custom_code',
         'hiddenTag',
         'client_code',
@@ -50,7 +50,7 @@ class OrderIssueFilters
         'id',
         'created_at_start',
         'created_at_end',
-        'order_issue_type_id',
+        'order_issue_type',
         'logistic_indemnity_money',
         'baoshi_indemnity_money',
         'rejectingStatus',
@@ -59,12 +59,12 @@ class OrderIssueFilters
         'settlement_at_end',
         'sendOrderClientCode',
         'sendOrderLogisticNumber',
-        'user_workgroups',
+        'workgroups',
         'shop_name',
         'finance_confirm',
         'logistic_number_return',
         'final_status',
-        'user_owner_group_id',
+        'user_owner_group',
         'archive_at_start',
         'archive_at_end',
     ];
@@ -172,8 +172,8 @@ class OrderIssueFilters
 
         $user = Auth::user();
         $owner_ids = $user ? app('UserService')->getPermittingOwnerIds($user) : [];
-        if (isset($this->params['owner_id'])){
-            $this->searchWay($this->getOrderQuery(),$this->params['owner_id'],'orders.owner_id');
+        if (isset($this->params['owner'])){
+            $this->searchWay($this->getOrderQuery(),$this->params['owner'],'orders.owner_id');
         } else{
             $this->getOrderQuery()->whereIn('owner_id',$owner_ids);
         }
@@ -249,7 +249,7 @@ class OrderIssueFilters
         $this->queryBuilder->where('order_issues.is_new_rejecting',$is_new_rejecting);
     }
 
-    public function logistic_id($logistic_id)
+    public function logistic($logistic_id)
     {
         $this->getOrderQuery()->where('orders.logistic_id',$logistic_id);
     }
@@ -324,7 +324,7 @@ class OrderIssueFilters
         $this->queryBuilder->where('order_issues.created_at', '<=', $created_at_end . " 23:59:59");
     }
 
-    public function order_issue_type_id($order_issue_type_id)
+    public function order_issue_type($order_issue_type_id)
     {
         $this->searchWay($this->queryBuilder,$order_issue_type_id,'order_issues.order_issue_type_id');
     }
@@ -370,7 +370,7 @@ class OrderIssueFilters
         $this->searchWay($this->queryBuilder,$sendOrderClientCode,'order_issues.second_client_no');
     }
 
-    public function user_workgroups($user_work_groups)
+    public function workgroups($user_work_groups)
     {
         if(is_string($user_work_groups)){
             $user_work_groups = explode(',', $user_work_groups);
@@ -431,7 +431,7 @@ class OrderIssueFilters
         $this->queryBuilder->where('order_issues.finance_confirm',$finance_confirm);
     }
 
-    public function user_owner_group_id($user_owner_group_id)
+    public function user_owner_group($user_owner_group_id)
     {
         $this->queryBuilder->where('order_issues.user_owner_group_id',$user_owner_group_id);
     }

+ 4 - 4
app/Filters/OrderTrackFilters.php

@@ -24,7 +24,7 @@ class OrderTrackFilters
     protected $queryBuilder;
     protected $params = [];
     protected $filters = ['client_code', 'order_client_code_wms',
-        'logistic_id', 'client', 'web_order_number', 'sku', 'logistic_number','remark','ids',
+        'logistic', 'client', 'web_order_number', 'sku', 'logistic_number','remark','ids',
         'start_at', 'end_at', 'start_planning_sent_at', 'end_planning_sent_at'];
     protected $array_filter;
 
@@ -65,8 +65,8 @@ class OrderTrackFilters
         // 货主
         $user = Auth::user();
         $owner_ids = $user ? app(UserService::class)->getPermittingOwnerIds($user) : [];
-        if (isset($this->params['owner_id'])) {
-            $ownerIds = explode(",", $this->params['owner_id']);
+        if (isset($this->params['owner'])) {
+            $ownerIds = explode(",", $this->params['owner']);
             $owner_ids = array_intersect($owner_ids, $ownerIds);
         }
         $this->ownerId($owner_ids);
@@ -110,7 +110,7 @@ class OrderTrackFilters
         $this->searchWay($this->queryBuilder,$order_client_code_wms,'order_trackings.order_client_code_wms');
     }
 
-    public function logistic_id($logistic_id)
+    public function logistic($logistic_id)
     {
         $this->queryBuilder->where('order_trackings.logistic_id',$logistic_id);
     }

+ 5 - 5
resources/views/order/issue/index.blade.php

@@ -1046,7 +1046,7 @@
                 let data = [[
                     {name: 'created_at_start', type: 'dateTime', tip: '登记开始日期'},
                     {
-                        name: 'owner_id',
+                        name: 'owner',
                         type: 'select_multiple_select',
                         tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'],
                         placeholder: ['货主', '定位或多选货主'],
@@ -1060,7 +1060,7 @@
                         placeholder: '原始运单号'
                     },
                     {
-                        name: 'logistic_id',
+                        name: 'logistic',
                         type: 'select_multiple_select',
                         tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的承运商'],
                         placeholder: ['承运商', '定位或多选承运商'],
@@ -1089,7 +1089,7 @@
                         }]
                     },
                     {
-                        name: 'user_owner_group_id',
+                        name: 'user_owner_group',
                         type: 'select',
                         tip: '项目责任方',
                         placeholder: '项目责任方',
@@ -1104,7 +1104,7 @@
                     {name: 'id_quality_label', type: 'select', tip: '是否正品', placeholder: '是否正品', data: this.qualityLabel},
                     {name: 'is_imported', type: 'select', tip: '是否导入处理', placeholder: '是否导入处理', data: imported_status},
                     {
-                        name: 'user_workgroups',
+                        name: 'workgroups',
                         type: 'select_multiple_select',
                         tip: ['事故责任方', ''],
                         placeholder: ['事故责任方', ''],
@@ -1132,7 +1132,7 @@
                         name: 'final_status', type: 'select', tip: '问题件的最终状态', placeholder: '最终状态', data: final_status
                     },
                     {
-                        name: 'order_issue_type_id',
+                        name: 'order_issue_type',
                         type: 'select_multiple_select',
                         tip: ['问题类别', ''],
                         placeholder: ['问题类别', ''],

+ 2 - 2
resources/views/order/tracking/index.blade.php

@@ -381,7 +381,7 @@
                 let data = [
                     [
                         {name:'start_at',type:'dateTime',tip:'起始日期',placeholder:'起始日期'},
-                        {name:'owner_id',type:'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'], placeholder: ['货主', '定位或多选货主'], data: _this.owners},
+                        {name:'owner',type:'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的客户'], placeholder: ['货主', '定位或多选货主'], data: _this.owners},
                         {name:'start_planning_sent_at',type:'dateTime',tip:'应送达时间开始',placeholder:'应送达时间开始'},
                         {name:'client_code',type:'input',tip:'订单号',placeholder:'订单号'},
                         {name:'web_order_number',type:'input',tip:'web+订单号',placeholder:'web+订单号'},
@@ -396,7 +396,7 @@
                         {name:'end_at',type:'dateTime',tip:'结束日期',placeholder: '结束日期'},
                         {name:'logistic_number',type:'input',tip:'运输单号',placeholder:'运输单号'},
                         {name:'end_planning_sent_at',type:'dateTime',tip:'应送达时间结束',placeholder:'应送达时间结束'},
-                        {name:'logistic_id',type:'select',tip:'物流方式',placeholder:'物流方式',data:this.logistics},
+                        {name:'logistic',type:'select',tip:'物流方式',placeholder:'物流方式',data:this.logistics},
                         {name:'sku',type:'input',tip:'SKU',placeholder: '商品编号'},
                     ]
                 ];