Merge remote-tracking branch 'origin/master'

app/Http/Controllers/RejectedController.php

@@ -41,6 +41,10 @@ class RejectedController extends Controller
         $this->userService = $userService;
     }
 
+    public function getTotal(Request $request)
+    {
+        return app('RejectedService')->getTotal($request->input());
+    }
     /**
      * Display a listing of the resource.
      * @param GateRequest $request
@@ -361,38 +365,17 @@ class RejectedController extends Controller
     protected function validatorUpdate(array $data)
     {
         return Validator::make($data, [
-//            'name' => ['required', 'string', 'max:50'],
         ]);
     }
 
-    /**
-     * Display the specified resource.
-     *
-     * @param Rejected $rejected
-     * @return void
-     */
     public function show(Rejected $rejected)
     {
-        //
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param Rejected $rejected
-     * @return Response
-     */
     public function edit(RejectedBill $rejectedBill)
     {
     }
 
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param Rejected $rejected
-     * @return Response
-     */
     public function update(Request $request, Rejected $rejected)
     {
         if(!Gate::allows('退货管理-编辑')){ return redirect(url('/'));  }
@@ -403,22 +386,8 @@ class RejectedController extends Controller
         return redirect('rejected/')->with('successTip',"成功修改退货信息“{$rejected['name']}”！");
     }
 
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param Rejected $rejected
-     * @return array|Response
-     * @throws Exception
-     */
     public function destroy(Rejected $rejected)
     {
-//        if(!Gate::allows('退货管理-删除')){ return redirect(url('/'));}
-//        app('LogService')->log(__METHOD__,__FUNCTION__,$rejectedBill->toJson(),Auth::user()['id']);
-//        $items=$rejectedBill->items();
-//        $items->delete();
-//        app('LogService')->log(__METHOD__,__FUNCTION__,$items->toJson(),Auth::user()['id']);
-//        $re=$rejectedBill->delete();
-//        return ['success'=>$re];
     }
     public function export(Request $request){
         ini_set('max_execution_time',2500);
@@ -475,6 +444,7 @@ class RejectedController extends Controller
     //analyzeSearch 统计查询 zengjun
     public function indexAnalyze(Request $request)
     {
+        ini_set('max_execution_time',2500);
         if(!Gate::allows('退货管理-查询')){ return redirect(url('/'));  }
         $paginateParams = $this->getAnalyzeSearchParams($request);
         $rejectedBills =  RejectedAnalyzeOwner::findBy($paginateParams);
@@ -520,17 +490,6 @@ class RejectedController extends Controller
             ];
         }
         return Export::make($row,$json,"退货统计记录单");
-//        dd($json);
-//        $e = new Export();
-//        $e->setMysqlConnection(config('database.connections.mysql.host'),
-//            config('database.connections.mysql.port'),config('database.connections.mysql.database')
-//            ,config('database.connections.mysql.username'),config('database.connections.mysql.password'));
-//        $e->setFileName("退货统计记录单");
-//        return $e->sql($sql,[
-//            "owner_name"=>"货主名","bounce_amount"=>"退件单数",
-//            "check_amount"=>"审核单数","uncheck_amount"=>"未审核单数",
-//            "in_storage_count"=>"入库单数","not_in_storage_count"=>"未入库单数",
-//        ])->direct();
     }
 
     public function apiGetRejectedByLogisticNumberReturn(Request $request){

app/Http/Controllers/TestController.php

@@ -62,10 +62,8 @@ class TestController extends Controller
         }
     }
     public function test(){
-        $s = new LogisticService();
-        $logistic = Logistic::query()->select("id","name")->where("name","like","%{$s->assertExpressCompany("9785871490917")}%")->first();
-        $logisticId = $logistic ? $logistic->id : 0;
-        dd($logisticId);
+        $owners = [1,32];
+        dd("AND id_owner IN (".implode(",",$owners).")");
     }
 
     public function test123()

app/RejectedAnalyzeOwner.php

@@ -81,7 +81,7 @@ class RejectedAnalyzeOwner extends Model
     }
 
     // 拼接条件     zengjun
-    public static function getCondition($array)
+    public static function getCondition($array, $owners)
     {
         if (isset($array['data'])){
             $condition=RejectedAnalyzeOwner::getSqlToIDs($array['data']);
@@ -105,6 +105,9 @@ class RejectedAnalyzeOwner extends Model
                 }
             }
         }
+        if (count($owners) > 0){
+            $condition .= "AND id_owner IN (".implode(",",$owners).")";
+        }
         $condition .= ' group by id_owner';
         return $condition;
     }
@@ -126,8 +129,9 @@ class RejectedAnalyzeOwner extends Model
     }
 
     // 返回sql    zengjun
-    public static  function getQuerySQL($array= null){
-        $condition = RejectedAnalyzeOwner::getCondition($array);// 条件
+    public static  function getQuerySQL($array){
+        $owners = app("OwnerService")->getIdArr();
+        $condition = RejectedAnalyzeOwner::getCondition($array, $owners);// 条件
         $sql = 'select distinct rao.id_owner,owners.name owner_name,sum(bounce_amount) bounce_amount,sum(check_amount) check_amount,sum(in_storage_count) in_storage_count,sum(not_in_storage_count) not_in_storage_count from';
         $sql .= '(';
         // 退件单数
@@ -147,8 +151,10 @@ class RejectedAnalyzeOwner extends Model
         $sql .= $condition;
         $sql .= ') rao ';
         $sql .= ' left join owners on owners.id = rao.id_owner and owners.deleted_at is null ';
+        if (count($owners) == 0){
+            $sql .= " WHERE 0=1 ";
+        }
         $sql .= ' group by rao.id_owner';
-        $sql .= ' having owners.name is not null';
         if(isset($array['uncheck_amount'])){
             // 审核数为0
             if($array['uncheck_amount'] == 0)$sql.=' and bounce_amount - check_amount in (0)  ';

app/Services/RejectedService.php

@@ -141,6 +141,16 @@ class RejectedService
         },config('cache.expirations.oftenChange'));
     }
 
+    public function getTotal(array $params):int
+    {
+        $owners =  app("OwnerService")->getIdArr();
+        $logistics =  app("LogisticService")->getIdArr();
+        if (count($owners) == 0 && count($logistics) == 0){
+            return 0;
+        }
+        return $this->conditionQuery($params, $owners, $logistics)->count();
+    }
+
     public function get(Request $request)
     {
         return $this->cacheService->getOrExecute('Rejecteds'.md5(json_encode($request->toArray())),function()use($request){

resources/js/queryForm/queryForm.js

@@ -1249,6 +1249,21 @@ const query = function getQueryForm(data) {
         rendererSearchFormOn_data();
     }
 
+    this.isRender = function isRender(){
+        let bool = false;
+        for (let key in _data) {
+            let {value,name} = _data[key];
+            if(name === 'paginate') continue;
+            if(controlJsType(value,'array') && value.length > 0){
+                bool = true;
+            }
+            if(controlJsType(value,'string') && value !== ""){
+                bool = true;
+            }
+        }
+        return bool;
+    }
+
     function rendererSearchFormOn_data() {
         for (let key in _data) {
             let value = _data[key].value, type = _data[key].type, mold = _data[key].mold;
@@ -1260,7 +1275,6 @@ const query = function getQueryForm(data) {
             //     }
             // }
             _data[key].select = value;
-
             if (['input', 'dateTime', 'dateTimeLocal', 'dateMonth'].includes(mold)) {
                 rendererSearchFormOnInput(key, value, mold);
             } else if (['select'].includes(mold)) {

resources/views/rejected/search/general.blade.php

@@ -257,6 +257,9 @@
                     condition:data
                 });
                 this.form.init();
+                if (this.form.isRender()){
+                    this.getTotal();
+                }
                 let column = [
                     {name:'index',value: '序号', neglect: true},
                     {name:'checked_numbers',value: '是否审核', },
@@ -305,6 +308,16 @@
                 });
             },
             methods:{
+                renderingTotal(){
+                    $("#paginate").after('<div class="position-relative font-weight-bold" style="left:160px;top:0;margin-top: -25px">共 <b style="color:#0000FF!important;">'+
+                        this.sum+'</b> 条数据</div>');
+                },
+                getTotal(){
+                    window.axios.post(window.location.href).then(res=>{
+                        this.sum = res.data;
+                        this.renderingTotal();
+                    });
+                },
                 removeCommonImg(id){
                     $('#'+id).remove();
                 },

routes/web.php

@@ -495,7 +495,8 @@ Route::group(['middleware' => 'auth'], function ($route) {
         });
         /** 主页 */
         Route::group(['prefix' => 'index'], function () {
-            Route::any('general', 'RejectedController@index');
+            Route::get('general', 'RejectedController@index');
+            Route::post('general', 'RejectedController@getTotal');
             Route::any('analyze', 'RejectedController@indexAnalyze');
             Route::get('import', 'RejectedController@import');
             Route::post('cancelCheck', 'RejectedController@cancelCheck');