Zhouzhendong 6 лет назад
Родитель
Сommit
cce0d448ad

+ 1 - 30
app/Http/Controllers/PackageController.php

@@ -360,36 +360,7 @@ class PackageController extends Controller
             $list[$i]=$w;
         }
         return Excel::download(new WaybillExport($row,$list),date('YmdHis', time()).'-称重统计记录单.xls');
-       /* $writer = WriterEntityFactory::createXLSXWriter();
-// $writer = WriterEntityFactory::createODSWriter();
-// $writer = WriterEntityFactory::createCSVWriter();
-
-        $writer->openToBrowser("test.xlsx"); // write data to a file or to a PHP stream
-//$writer->openToBrowser($fileName); // stream data directly to the browser
-
-        $cells = [
-            WriterEntityFactory::createCell('a'),
-            WriterEntityFactory::createCell('is'),
-            WriterEntityFactory::createCell('great!'),
-        ];
-
-        /** add a row at a time */
-        /* $singleRow = WriterEntityFactory::createRow($cells);
-        $writer->addRow($singleRow);
-
-        /** add multiple rows at a time */
-        /*  $multipleRows = [
-             WriterEntityFactory::createRow($cells),
-             WriterEntityFactory::createRow($cells),
-         ];
-         $writer->addRows($multipleRows);
-
-         /** Shortcut: add a row from an array of values */
-        /* $values = ['Carl', 'is', 'great!'];
-        $rowFromValues = WriterEntityFactory::createRowFromArray($values);
-        $writer->addRow($rowFromValues);
-
-        $writer->close();*/
     }
 
+
 }

+ 0 - 1
composer.json

@@ -12,7 +12,6 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "box/spout": "^3.1",
         "doctrine/dbal": "^2.10",
         "fideloper/proxy": "^4.0",
         "kitetail/zttp": "^0.6.0",

+ 11 - 7
resources/views/waybill/index.blade.php

@@ -88,12 +88,16 @@
                     <tr>
                         <td colspan="5">
                             <label style="margin-left: 5px"> 操作选定记录:</label>
-                            <select @change="waybillExport($event)" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
-                                    title="导出所有页将会以搜索条件得到的过滤结果,将其全部记录(每一页)导出">
-                                <option >导出Excel   </option>
-                                <option value="1">导出勾选内容</option>
-                                <option value="2">导出所有页</option>
-                            </select>
+                            <span class="dropdown">
+                                <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData>0?'btn-dark':'btn-outline-dark']"
+                                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果,将其全部记录(每一页)导出">
+                                    导出Excel
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" @click="waybillExport(1)" href="javascript:">导出勾选内容</a>
+                                    <a class="dropdown-item" @click="waybillExport(2)" href="javascript:">导出所有页</a>
+                                </div>
+                            </span>
                             <input hidden type="submit" value="kk">
                         </td>
                     </tr>
@@ -435,7 +439,7 @@
                     }
                 },
                 waybillExport(e){
-                    let val=e.target.value;
+                    let val=e;
                     let data=this.filterData;
                     console.log(val)
                     if (val==1) {

+ 11 - 7
resources/views/waybill/waybillFinancialSnapshot/index.blade.php

@@ -44,12 +44,16 @@
     @if(!isset($excepted))
     <div class="card-header">
     <label>操作选定记录:</label>
-    <select @change="waybillExport($event)" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
-            title="导出所有页将会以搜索条件得到的过滤结果,将其全部记录(每一页)导出">
-        <option >导出Excel   </option>
-        <option value="1">导出勾选内容</option>
-        <option value="2">导出所有页</option>
-    </select>
+        <span class="dropdown">
+            <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData>0?'btn-dark':'btn-outline-dark']"
+                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果,将其全部记录(每一页)导出">
+                导出Excel
+            </button>
+            <div class="dropdown-menu">
+                <a class="dropdown-item" @click="waybillExport(1)" href="javascript:">导出勾选内容</a>
+                <a class="dropdown-item" @click="waybillExport(2)" href="javascript:">导出所有页</a>
+            </div>
+        </span>
     </div>
     @endif
     <table class="table  table-hover table-bordered text-nowrap " style="width: 1500px;height: auto">
@@ -222,7 +226,7 @@
                 }
             },
             waybillExport(e){
-                let val=e.target.value;
+                let val=e;
                 let data=this.filterData;
                 if (val==1) {
                     if (this.checkData.length <= 0) {

+ 11 - 7
resources/views/weight/package/index.blade.php

@@ -77,12 +77,16 @@
                                     <span class="text-muted">操作选定记录:</span>
                                 </td>
                                 <td colspan="9">
-                                    <select @change="packageExport($event)" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
-                                             title="导出所有页将会以搜索条件得到的过滤结果,将其全部记录(每一页)导出">
-                                        <option >导出Excel</option>
-                                        <option value="1">导出勾选内容</option>
-                                        <option value="2">导出所有页</option>
-                                    </select>
+                                    <span class="dropdown">
+                                        <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData>0?'btn-dark':'btn-outline-dark']"
+                                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果,将其全部记录(每一页)导出">
+                                            导出Excel
+                                        </button>
+                                        <div class="dropdown-menu">
+                                            <a class="dropdown-item" @click="packageExport(1)" href="javascript:">导出勾选内容</a>
+                                            <a class="dropdown-item" @click="packageExport(2)" href="javascript:">导出所有页</a>
+                                        </div>
+                                    </span>
                                     <input hidden type="submit" value="kk">
                                 </td>
                             </tr>
@@ -243,7 +247,7 @@
                     }
                 },
                 packageExport(e){
-                    let val=e.target.value;
+                    let val=e;
                     let data=this.filterData;
                     if (val==1){
                         if (this.checkData&&this.checkData.length<=0){

+ 11 - 7
resources/views/weight/weightExcepted/index.blade.php

@@ -24,12 +24,16 @@
                                     </select></label></td>
                                 <td colspan="5">
                                     <label style="margin-left: 5px"> 操作选定记录:</label>
-                                    <select @change="weightExport($event)" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
-                                            title="导出所有页将会以搜索条件得到的过滤结果,将其全部记录(每一页)导出">
-                                        <option >导出Excel</option>
-                                        <option value="1">导出勾选内容</option>
-                                        <option value="2">导出所有页</option>
-                                    </select>
+                                    <span class="dropdown">
+                                        <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData>0?'btn-dark':'btn-outline-dark']"
+                                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果,将其全部记录(每一页)导出">
+                                            导出Excel
+                                        </button>
+                                        <div class="dropdown-menu">
+                                            <a class="dropdown-item" @click="weightExport(1)" href="javascript:">导出勾选内容</a>
+                                            <a class="dropdown-item" @click="weightExport(2)" href="javascript:">导出所有页</a>
+                                        </div>
+                                    </span>
                                     <input hidden type="submit" value="kk">
                                 </td>
                             </tr>
@@ -177,7 +181,7 @@
                     }
                 },
                 weightExport(e){
-                    let val=e.target.value;
+                    let val=e;
                     if (val==1) {
                         if (this.checkData.length <= 0) {
                             tempTip.setDuration(4000);