Zhouzhendong %!s(int64=4) %!d(string=hai) anos
pai
achega
dee73bb9c8

+ 0 - 1
app/Http/Controllers/PriceModelController.php

@@ -18,7 +18,6 @@ use App\OwnerPriceOperationItem;
 use App\OwnerPriceSystem;
 use App\OwnerStoragePriceModel;
 use App\Services\common\BatchUpdateService;
-use App\Services\common\ExportService;
 use App\Services\common\QueryService;
 use App\Services\LogService;
 use App\Services\OwnerPriceOperationItemService;

+ 2 - 2
app/Http/Controllers/RejectedController.php

@@ -24,7 +24,6 @@ use Illuminate\Http\Response;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\View\View;
 use Maatwebsite\Excel\Facades\Excel;
@@ -420,7 +419,8 @@ class RejectedController extends Controller
             "sender"=>"姓名","mobile_sender"=>"手机",
             "logistic_number"=>"原单单号","logistic_number_return"=>"退回单号","logistic_name"=>"退回公司",
             "fee_collected"=>"到付费用","is_loaded"=>"是否入库",
-            "item_barcode"=>"商品条码","item_name"=>"商品名称"
+            "item_barcode"=>"商品条码","item_name"=>"商品名称",
+            "item_amount"=>"商品数量","quality_label_name"=>"商品名称"
         ])->direct();
     }
 

+ 0 - 3
resources/views/customer/project/area.blade.php

@@ -232,7 +232,6 @@
                     el: "table",
                     name: "area",
                     column: column,
-                    isCheckAllBox: false,
                     data: this.areas,
                     fixedTop:($('#form_div').height())+2,
                 }).init();
@@ -242,8 +241,6 @@
                     $("#area_"+index).slideToggle();
                 },
                 areaExport(isAll){
-                    console.log(checkData);
-                    return;
                     let url = '{{url('customer/project/area/export')}}';
                     let token='{{ csrf_token() }}';
                     excelExport(isAll,checkData,url,this.sum,token);