From cc54025b9b42a5aa0d947c644213816da37ecdb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Tue, 15 Aug 2023 17:58:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20#100000=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Filters/BusinessOrderFilter.php           |  5 ++++
 app/Models/BusinessOrder.php                  |  1 +
 .../frontend/src/views/plat/orderList.vue     | 26 ++++++-------------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/Filters/BusinessOrderFilter.php b/app/Filters/BusinessOrderFilter.php
index 1123581..d3765fe 100644
--- a/app/Filters/BusinessOrderFilter.php
+++ b/app/Filters/BusinessOrderFilter.php
@@ -7,6 +7,11 @@ use Carbon\Carbon;
 
 class BusinessOrderFilter extends Filters
 {
+    protected function ids($value)
+    {
+        return $this->builder->whereIn('id', $value);
+    }
+
     protected function participateNo($value)
     {
         return $this->builder->where('participate_no', trim($value));
diff --git a/app/Models/BusinessOrder.php b/app/Models/BusinessOrder.php
index ea9137e..a38dcd5 100644
--- a/app/Models/BusinessOrder.php
+++ b/app/Models/BusinessOrder.php
@@ -21,6 +21,7 @@ class BusinessOrder extends Model
         'confirm_at_end',
         'goods_sku_num',
         'print_status',
+        'ids',
     ];
 
     protected $fillable = [
diff --git a/resources/frontend/src/views/plat/orderList.vue b/resources/frontend/src/views/plat/orderList.vue
index e29d81c..0625603 100644
--- a/resources/frontend/src/views/plat/orderList.vue
+++ b/resources/frontend/src/views/plat/orderList.vue
@@ -9,14 +9,6 @@
                     </el-select>
                 </el-form-item>
 
-                <!-- <el-form-item label="活动名称:">
-                    <el-select v-model="form.activity_no" placeholder="活动名称">
-                        <el-option v-for="item in groupActivity" :key="item.activity_no" :label="item.activity_title"
-                            :value="item.activity_no">
-                        </el-option>
-                    </el-select>
-                </el-form-item> -->
-
                 <el-form-item label="发货状态:">
                     <el-select v-model="form.shipping_status" placeholder="发货状态">
                         <el-option value="" label="全部"></el-option>
@@ -50,13 +42,6 @@
                     </el-select>
                 </el-form-item>
 
-                <!-- <el-form-item label="帮卖团跟团号:">
-                    <el-input v-model="form.participate_no" placeholder="帮卖团跟团号"></el-input>
-                </el-form-item>
-                <el-form-item label="自卖团跟团号:">
-                    <el-input v-model="form.supply_participate_no" placeholder="自卖团跟团号"></el-input>
-                </el-form-item> -->
-
                 <el-form-item label="商品数量:">
                     <el-select v-model="form.goods_sku_num" placeholder="商品数量">
                         <el-option value="" label="全部"></el-option>
@@ -171,6 +156,7 @@ export default {
                 print_status: "0",
                 external_sku_ids: [],
                 confirm_at: [],
+                ids: [],
             },
             dialogVisible: false,
             loading: true,
@@ -210,7 +196,6 @@ export default {
             timeoutnum: null, //断开 重连倒计时
             defaultPrinter: null,
             taskIDArray: [],
-            requestIDGetGlobalConfig: '',
         };
     },
     created() {
@@ -297,6 +282,7 @@ export default {
                 print_status: 0,
                 external_sku_ids: [],
                 confirm_at: this.confirmAt,
+                multipleSelectionIds: [],
             };
             this.getPlatOrderList();
         },
@@ -338,8 +324,12 @@ export default {
                 this.doPrint();
             })
         },
-        handleSelectionChange() {
-
+        handleSelectionChange(val) {
+            let ids = [];
+            val.forEach((item) => {
+                ids.push(item.id);
+            })
+            this.form.ids = ids;
         },
         initWebSocket() {
             //初始化weosocket