库存管理-盘点-任务列表增加导出功能

app/Http/Controllers/InventoryAccountController.php

@@ -193,18 +193,20 @@ class InventoryAccountController extends Controller
             $inventoryAccounts = app('inventoryAccountService')->some($queryParam);
         }
         $row = [[
-            'id' => '盘点编号',
+            'id' => '盘点单号',
             'status' => '盘点状态',
             'created_at' => '创建时间',
             'owner_id' => '货主',
             'type' => '任务类型',
             'start_at' => '起始时间',
             'end_at' => '结束时间',
-            'total' => '记录数',
-            'processed' => '已盘数',
-            'surplus' => '剩余数',
-            'difference' => '复盘差异',
+            'total' => '盘点任务数',
+            'processed' => '盘点数量',
+            'surplus' => '未盘数量',
+            'ignored' => '跳过数量',
+            'difference' => '差异数量',
             'returned' => '复盘归位',
+            'proportion' => '盘点比例',
         ]];
         $list = [];
         for ($i = 0; $i < count($inventoryAccounts); $i++) {
@@ -220,8 +222,10 @@ class InventoryAccountController extends Controller
                 'total' => isset($inventoryAccount->total) ? $inventoryAccount->total : '',
                 'processed' => isset($inventoryAccount->processed) ? $inventoryAccount->processed : '',
                 'surplus' => isset($inventoryAccount->surplus) ? $inventoryAccount->surplus : '',
+                'ignored' => isset($inventoryAccount->ignored) ? $inventoryAccount->ignored : '',
                 'difference' => isset($inventoryAccount->difference) ? $inventoryAccount->difference : '',
                 'returned' => isset($inventoryAccount->returned) ? $inventoryAccount->returned : '',
+                'proportion' => isset($inventoryAccount->processed) && isset($inventoryAccount->total) ? $inventoryAccount->processed.'/'.$inventoryAccount->total : '',
             ];
             $list[$i] = $w;
         }

resources/views/inventory/stockInventory/mission.blade.php

@@ -34,6 +34,18 @@
         </form>
         </div>
         <div id="form_div" class="mt-2"></div>
+        <div class="row mt-2">
+        <span class="dropdown ml-3">
+        <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
+                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
+            导出Excel
+        </button>
+        <div class="dropdown-menu">
+            <a class="dropdown-item" @click="inventoryExport(false)" href="javascript:">导出勾选内容</a>
+            <a class="dropdown-item" @click="inventoryExport(true)" href="javascript:">导出所有页</a>
+        </div>
+        </span>
+        </div>
         <div class=" pt-1">
             <table class="table table-sm text-nowrap table-striped table-bordered m-0 td-min-width-80" id="table">
                 <tr v-for="(inventory,i) in inventoryAccounts" @click="selectedColor(inventory.id,$event)" :style="{'font-weight': inventory.id===selectedStyle?'bold':''}" :class="selectedStyle === inventory.id ? 'focusing':''">
@@ -182,10 +194,10 @@
                     }
                     this.selectedStyle=id;
                 },
-                inventoryExport(checkAllSign){
+                inventoryExport(selectAll){
                     let url = '{{url('inventory/stockInventoryExport')}}';
                     let token='{{ csrf_token() }}';
-                    excelExport(checkAllSign,checkData,url,this.sum,token);
+                    excelExport(selectAll,checkData,url,this.sum,token);
                 },
                 //生成盘点任务
                 createInventoryMission(){