报表部分优化，其他细节优化

app/admin/controller/After.php

@@ -283,7 +283,7 @@ class After extends Base
                     ->name('supplier')
                     ->where(['is_del' => 0, 'personid' => $arr])
                     ->column('code');
-                $condition[] = ["a.supplierNo", "in", $supplierNos];
+                $where[] = ["a.supplierNo", "in", $supplierNos];//这个地方不应该使用condition，应该使用where与其他条件并列
             }
         }
 
@@ -323,6 +323,12 @@ class After extends Base
         $all_createrid = array_column($list, 'apply_id');
         $item = get_company_name_by_uid($all_createrid);
 
+        //获取最新的供应商负责人信息
+        $codes = array_unique(array_column($list,'supplierNo'));
+        $tmp=\app\admin\common\User::getIns()->handle('sGetList',['more_code'=>$codes,'size'=>count($codes)]);
+        $person = array_column($tmp['data']['list'],'person','code');
+        $personid = array_column($tmp['data']['list'],'personid','code');
+
         //获取客户信息
 //        $all_customer_code = array_column($list, 'customer_code');
 
@@ -331,7 +337,6 @@ class After extends Base
         //校验是否开通了供应商账号
         $supp_account = checkHasAccountBySupplierNos(array_unique(array_column($list,'supplierNo')));
 
-
         $data = [];
         foreach ($list as $value) {
 
@@ -340,6 +345,8 @@ class After extends Base
             $value['company_name'] = $item[$value['apply_id']] ?? '';
             $value['has_account'] = (int)isset($supp_account[$value['supplierNo']]);
 
+            $value['person'] = $person[$value['supplierNo']]??0;
+            $value['person_id'] = $personid[$value['supplierNo']]??0;
             //是否具有编辑权限
 //            $value['is_allow_update'] = 0;
 //            if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;

app/admin/controller/Report.php

@@ -86,7 +86,7 @@ class Report extends Base
             'status|状态' => 'require|number|in:5,6,8',
         ]);
 
-        if (!$val->check($param)) return error_show(1004, $val->getError());
+        if (!$val->check($param)) return json_show(1004, $val->getError());
 
         $where_ladder = [['gl.is_del', '=', 0]];
         $where_good = [['g.is_del', '=', 0]];
@@ -134,10 +134,10 @@ class Report extends Base
             ->order('g.id')
             ->select()
             ->toArray();
-        $supplerArr=array_column($rs_temp_good,"供应商名称");
-         $userCommon = \app\admin\common\User::getIns();
-         $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $supplerArr]);
-         $supplier=$supplier_temp['data']??[];
+        $supplerArr = array_column($rs_temp_good, "供应商名称");
+        $userCommon = \app\admin\common\User::getIns();
+        $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $supplerArr]);
+        $supplier = $supplier_temp['data'] ?? [];
         $all_good_type = [0 => '非定制商品', 1 => '定制商品'];
         $all_brand = Db::name('brand')->whereIn('id', array_column($rs_temp_good, '商品品牌'))->where('is_del', 0)->column('brand_name', 'id');
         $all_cat = Db::name('cat')
@@ -156,7 +156,7 @@ class Report extends Base
             $value['一级分类'] = isset($all_cat[$value['三级分类']]['cat_name_1']) ? $all_cat[$value['三级分类']]['cat_name_1'] : '';
             $value['二级分类'] = isset($all_cat[$value['三级分类']]['cat_name_2']) ? $all_cat[$value['三级分类']]['cat_name_2'] : '';
             $value['三级分类'] = isset($all_cat[$value['三级分类']]['cat_name_3']) ? $all_cat[$value['三级分类']]['cat_name_3'] : '';
-			$value['供应商名称']= $supplier[$value['供应商名称']]??"";
+            $value['供应商名称'] = $supplier[$value['供应商名称']] ?? "";
             $temp = explode(',', $value['产地']);
             $value['产地'] = GetAddr(json_encode(['provice_code' => isset($temp[0]) ? $temp[0] : '', 'city_code' => isset($temp[1]) ? $temp[1] : '', 'area_code' => isset($temp[2]) ? $temp[2] : '']));
             $value['计量单位'] = isset($all_unit[$value['计量单位']]) ? $all_unit[$value['计量单位']] : '';
@@ -227,7 +227,7 @@ class Report extends Base
             'end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['a.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -256,7 +256,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $list, 'count' => $count]);
 
     }
 
@@ -276,7 +276,7 @@ class Report extends Base
             'end_date|创建结束日期' => 'date|egt:start_date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['po.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['po.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -378,7 +378,7 @@ class Report extends Base
             }
         }
 
-        return app_show(0, '请求成功', $da);
+        return json_show(0, '请求成功', $da);
 
     }
 
@@ -399,7 +399,7 @@ class Report extends Base
             'end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['cb.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['cb.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -467,7 +467,7 @@ class Report extends Base
         }
 
         $da[] = ['addtime' => '汇总', 'itemid' => 0, 'createrid' => 0, 'num' => array_sum(array_column($da, 'num')), 'total' => array_sum(array_column($da, 'total')), 'nickname' => '', 'name' => ''];
-        return app_show(0, '请求成功', $da);
+        return json_show(0, '请求成功', $da);
 
     }
 
@@ -487,7 +487,7 @@ class Report extends Base
             'end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -556,7 +556,7 @@ class Report extends Base
             }
         }
 
-        return app_show(0, '请求成功', $da);
+        return json_show(0, '请求成功', $da);
 
     }
 
@@ -583,7 +583,7 @@ class Report extends Base
             'cbaddtime_end_date|采购回复开始时间' => 'date|egt:cbaddtime_start_date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['cb.is_del', '=', 0]];
 
@@ -610,18 +610,25 @@ class Report extends Base
             ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
             ->leftJoin('supplier s', 's.code=cb.supplierNo')
             ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
-            ->withAttr('name', function ($val, $data) {
-                return get_company_name_by_uid($data['createrid']);
-            })
-            ->withAttr('salesman_name', function ($val, $data) {
-                return get_company_name_by_uid($data['saleid']);
-            })
+//            ->withAttr('name', function ($val, $data) {
+//                return get_company_name_by_uid($data['createrid']);
+//            })
+//            ->withAttr('salesman_name', function ($val, $data) {
+//                return get_company_name_by_uid($data['saleid']);
+//            })
             ->where($where)
             ->page($param['page'], $param['size'])
             ->order('ci.addtime', 'desc')
             ->select()
             ->toArray();
 
+        //获取所有创建人的部门
+        $item_name = get_company_name_by_uid(array_unique(array_merge(array_column($data, 'createrid'), array_column($data, 'saleid'))));
+        foreach ($data as &$value) {
+            $value['name'] = $item_name[$value['createrid']] ?? '';
+            $value['salesman_name'] = $item_name[$value['saleid']] ?? '';
+        }
+
         //汇总
         $data[] = [
             'id' => 0,
@@ -642,7 +649,7 @@ class Report extends Base
             'companyName' => '',
         ];
 
-        return app_show(0, '请求成功', ['count' => $count, 'list' => $data]);
+        return json_show(0, '请求成功', ['count' => $count, 'list' => $data]);
 
     }
 
@@ -669,7 +676,7 @@ class Report extends Base
             'cbaddtime_end_date|采购回复开始时间' => 'date|egt:cbaddtime_start_date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $rs = Db::name('consult_bids')
             ->alias('cb')
@@ -700,7 +707,7 @@ class Report extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有可供导出的数据';
+        if (empty($list)) $list[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($list[0]);
         excelSave('咨询单报表-已采反报价信息' . date('YmdHis'), $headerArr, $list);
@@ -728,7 +735,7 @@ class Report extends Base
             'end_updatetime' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['ci.is_del', '=', 0]];
 
@@ -764,7 +771,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $data, 'count' => $count]);
 
 
     }
@@ -788,7 +795,7 @@ class Report extends Base
             'end_updatetime' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['ci.is_del', '=', 0]];
 
@@ -813,7 +820,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        if (empty($data)) $data[] = '没有可供导出的数据';
+        if (empty($data)) $data[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($data[0]);
         excelSave('咨询单报表-未采反信息' . date('YmdHis'), $headerArr, $data);
@@ -838,7 +845,7 @@ class Report extends Base
             'end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['po.is_del', '=', 0], ["po.order_type", "<>", 1]];
 
@@ -851,20 +858,25 @@ class Report extends Base
 
         $count = Db::name('purchease_order')
             ->alias('po')
-            ->leftJoin('business b', 'b.companyNo=po.companyNo')
+//            ->leftJoin('business b', 'b.companyNo=po.companyNo')
+            ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
+            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode AND gb.is_del=0')
             ->where($where)
             ->count('po.id');
 
         $data = Db::name('purchease_order')
             ->alias('po')
-            ->field('po.cgdNo,po.addtime,po.supplierNo,po.supplier_name,po.good_name,gb.is_stock,po.good_num,po.nake_fee,po.total_fee,po.status,po.send_status,po.wsend_num,"" creater,"" creater_name,b.company,po.cgder_id,po.cgder,"" name,"" send_time,on.orderCode,po.order_type,po.bkcode,po.spuCode')
-            ->leftJoin('business b', 'b.companyNo=po.companyNo')
+            ->field('po.cgdNo,po.addtime,po.supplierNo,po.supplier_name,po.good_name,gb.is_stock,po.good_num,po.nake_fee,po.total_fee,po.status,po.send_status,po.wsend_num,"" creater,"" creater_name,"" company,po.cgder_id,po.cgder,"" name,"" send_time,on.orderCode,po.order_type,po.bkcode,po.spuCode,po.companyNo')
+//            ->leftJoin('business b', 'b.companyNo=po.companyNo')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
             ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode AND gb.is_del=0')
             ->where($where)
             ->page($param['page'], $param['size'])
             ->order('po.addtime', 'desc')
-            ->cursor();
+            ->select()
+            ->toArray();
+
+        $names = get_headquarters_code_and_name(array_unique(array_column($data, 'companyNo')));
 
         $list = [];
         foreach ($data as $v) {
@@ -879,10 +891,11 @@ class Report extends Base
             $v['is_stock'] = isset($all_is_stock[$v['is_stock']]) ? $all_is_stock[$v['is_stock']] : '';
 
             //创建人//order_type==1备库单
-            if ($v['order_type'] == 1) $temp = Db::name('purchease')->where(['bk_code' => $v['bkcode'], 'spuCode' => $v['spuCode'], 'is_del' => 0])->field('id,apply_name,apply_id')->find();
-            else $temp = Db::name('sale')->where(['orderCode' => $v['orderCode'], 'is_del' => 0])->field('id,apply_id,apply_name')->find();
+            if ($v['order_type'] == 1) $temp = Db::name('purchease')->where(['bk_code' => $v['bkcode'], 'spuCode' => $v['spuCode'], 'is_del' => 0])->field('id,apply_name,apply_id')->findOrEmpty();
+            else $temp = Db::name('sale')->where(['orderCode' => $v['orderCode'], 'is_del' => 0])->field('id,apply_id,apply_name')->findOrEmpty();
             $v['creater'] = isset($temp['apply_name']) ? $temp['apply_name'] : '';
-            $v['creater_name'] = get_company_name_by_uid($temp['apply_id'] ?? 0);
+           $v['apply_id'] = $temp['apply_id'];
+//            $v['creater_name'] = $tmp_names[$temp['apply_id']];
 
             //创建时间
             $v['send_time'] = Db::name('order_out')
@@ -890,12 +903,19 @@ class Report extends Base
                 ->order('addtime', 'desc')
                 ->value('addtime');
 
-            $v['name'] = get_company_name_by_uid($v['cgder_id'] ?? 0);
-
+//            $v['name'] = $company_names[$v['cgder_id']] ?? '';
+            $v['company'] = $names[$v['companyNo']] ?? '';
             $list[] = $v;
         }
 
-        return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
+
+        $company_names = get_company_name_by_uid(array_unique(array_merge(array_column($data, 'cgder_id'),array_column($data, 'apply_id'))));
+        foreach ($list as &$value){
+            $value['name']=$company_names[$value['cgder_id']]??'';
+            $value['creater_name']=$company_names[$value['apply_id']]??'';
+        }
+
+        return json_show(0, '请求成功', ['list' => $list, 'count' => $count]);
 
     }
 
@@ -914,7 +934,7 @@ class Report extends Base
             'end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['po.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['po.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -926,15 +946,17 @@ class Report extends Base
 
         $data = Db::name('purchease_order')
             ->alias('po')
-            ->field('po.cgdNo 采购单编号,po.addtime 创建时间,po.supplierNo 供应商编号,po.supplier_name 供应商名称,po.good_name 商品名称,gb.is_stock 商品库存性质,po.good_num 购买数量,po.nake_fee 裸价,po.total_fee 成本合计,po.status 单据状态,po.send_status 发货状态,po.wsend_num 未发货数量,"" 创建人,"" 创建人所属部门,b.company 客户名称,po.cgder 采购员,"" 采购员所属部门,"" 发货时间,on.orderCode,po.order_type,po.bkcode,po.spuCode,po.cgder_id')
-            ->leftJoin('business b', 'b.companyNo=po.companyNo')
+            ->field('po.cgdNo 采购单编号,po.addtime 创建时间,po.supplierNo 供应商编号,po.supplier_name 供应商名称,po.good_name 商品名称,gb.is_stock 商品库存性质,po.good_num 购买数量,po.nake_fee 裸价,po.total_fee 成本合计,po.status 单据状态,po.send_status 发货状态,po.wsend_num 未发货数量,"" 创建人,"" 创建人所属部门,"" 客户名称,po.cgder 采购员,"" 采购员所属部门,"" 发货时间,on.orderCode,po.order_type,po.bkcode,po.spuCode,po.cgder_id,po.companyNo')
+//            ->leftJoin('business b', 'b.companyNo=po.companyNo')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
             ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode AND gb.is_del=0')
             ->where($where)
             ->order('po.addtime', 'desc')
-            ->cursor();
+            ->select()
+            ->toArray();
 
         $list = [];
+        $names = get_headquarters_code_and_name(array_unique(array_column($data, 'companyNo')));
 
         foreach ($data as $v) {
 
@@ -952,7 +974,9 @@ class Report extends Base
             else $temp = Db::name('sale')->where(['orderCode' => $v['orderCode'], 'is_del' => 0])->field('id,apply_id,apply_name')->find();
 
             $v['创建人'] = isset($temp['apply_name']) ? $temp['apply_name'] : '';
-            $v['创建人所属部门'] = get_company_name_by_uid($temp['apply_id'] ?? 0);
+
+            $v['apply_id'] = $temp['apply_id'];
+//            $v['创建人所属部门'] = get_company_name_by_uid($temp['apply_id'] ?? 0);
 
             //创建时间
             $v['发货时间'] = Db::name('order_out')
@@ -960,18 +984,29 @@ class Report extends Base
                 ->order('addtime', 'desc')
                 ->value('addtime');
 
-            $v['采购员所属部门'] = get_company_name_by_uid($v['cgder_id'] ?? 0);
+//            $v['采购员所属部门'] = $company_names[$v['cgder_id']] ?? '';
+
+            $v['客户名称']=$names[$v['companyNo']]??'';
 
             unset($v['orderCode']);
             unset($v['order_type']);
             unset($v['bkcode']);
             unset($v['spuCode']);
-            unset($v['cgder_id']);
+            unset($v['companyNo']);
+//            unset($v['cgder_id']);
 
             $list[] = $v;
         }
 
-        if (empty($list)) $list[] = '没有可供导出的数据';
+        $company_names=get_company_name_by_uid(array_unique(array_merge(array_column($data,'cgder_id'),array_column($data,'apply_id'))));
+        foreach ($list as &$value){
+            $value['创建人所属部门'] =$company_names[$value['apply_id']]??'';
+            $value['采购员所属部门'] = $company_names[$value['cgder_id']] ?? '';
+            unset($value['apply_id']);
+            unset($value['cgder_id']);
+        }
+
+        if (empty($list)) $list[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($list[0]);
         excelSave('订单明细报表' . date('YmdHis'), $headerArr, $list);
@@ -994,7 +1029,7 @@ class Report extends Base
             'end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['or.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['or.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1013,13 +1048,13 @@ class Report extends Base
 
         $list = Db::name('order_return')
             ->alias('or')
-            ->field('or.id,or.returnCode,or.addtime,on.cgdNo,po.supplierNo,po.supplier_name,or.good_name,or.total_num, oo.updatetime receipttime ,or.error_num,or.error_remark,ri.result error_reason,or.status,po.cgder,ci.name')
+            ->field('or.id,or.returnCode,or.addtime,on.cgdNo,po.supplierNo,po.supplier_name,or.good_name,or.total_num, oo.updatetime receipttime ,or.error_num,or.error_remark,ri.result error_reason,or.status,po.cgder,"" name,po.cgder_id')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
             ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3 AND oo.is_del=0')
             ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
-            ->leftJoin('depart_user u', 'u.uid=po.cgder_id AND u.is_del=0')
-            ->leftJoin('company_item ci', 'ci.id=u.itemid')
+//            ->leftJoin('depart_user u', 'u.uid=po.cgder_id AND u.is_del=0')
+//            ->leftJoin('company_item ci', 'ci.id=u.itemid')
             ->where($where)
             ->withAttr('status', function ($val) use ($all_status) {
                 return isset($all_status[$val]) ? $all_status[$val] : $val;
@@ -1029,7 +1064,11 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
+        $company_names=get_company_name_by_uid(array_unique(array_column($list,'cgder_id')));
+        foreach ($list as &$value){
+            $value['name'] = $company_names[$value['cgder_id']]??'';
+        }
+        return json_show(0, '请求成功', ['list' => $list, 'count' => $count]);
 
     }
 
@@ -1047,7 +1086,7 @@ class Report extends Base
             'end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['or.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['or.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1056,13 +1095,13 @@ class Report extends Base
 
         $list = Db::name('order_return')
             ->alias('or')
-            ->field('or.returnCode 售后单编号,or.addtime 创建时间,on.cgdNo 采购单编号,po.supplier_name 供应商名称,or.good_name 产品名称,or.total_num 购买数量, oo.updatetime 签收日期,or.error_num 售后数量,or.error_remark 问题描述,ri.result 异常原因,or.status 售后状态,po.cgder 采购员,ci.name 采购员所属部门')
+            ->field('or.returnCode 售后单编号,or.addtime 创建时间,on.cgdNo 采购单编号,po.supplier_name 供应商名称,or.good_name 产品名称,or.total_num 购买数量, oo.updatetime 签收日期,or.error_num 售后数量,or.error_remark 问题描述,ri.result 异常原因,or.status 售后状态,po.cgder 采购员,"" 采购员所属部门,po.cgder_id')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
             ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3  AND oo.is_del=0')
             ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
-            ->leftJoin('depart_user u', 'u.uid=po.cgder_id AND u.is_del=0')
-            ->leftJoin('company_item ci', 'ci.id=u.itemid')
+//            ->leftJoin('depart_user u', 'u.uid=po.cgder_id AND u.is_del=0')
+//            ->leftJoin('company_item ci', 'ci.id=u.itemid')
             ->where($where)
             ->withAttr('售后状态', function ($val) use ($all_status) {
                 return isset($all_status[$val]) ? $all_status[$val] : $val;
@@ -1071,7 +1110,13 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        if (empty($list)) $list[] = '没有可供导出的数据';
+        $company_names = get_company_name_by_uid(array_unique(array_column($list, 'cgder_id')));
+        foreach ($list as &$value) {
+            $value['采购员所属部门'] = $company_names[$value['cgder_id']] ?? '';
+            unset($value['cgder_id']);
+        }
+
+        if (empty($list)) $list[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($list[0]);
         excelSave('售后明细报表' . date('YmdHis'), $headerArr, $list);
@@ -1098,7 +1143,7 @@ class Report extends Base
             'update_end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['s.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1134,7 +1179,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $list, 'count' => $count]);
 
     }
 
@@ -1156,7 +1201,7 @@ class Report extends Base
             'update_end_date' => 'date',
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['s.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1184,7 +1229,7 @@ class Report extends Base
             $data[] = $value;
         }
 
-        if (empty($data)) $data[] = '没有可供导出的数据';
+        if (empty($data)) $data[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($data[0]);
         excelSave('供应商报表' . date('YmdHis'), $headerArr, $data);
@@ -1207,7 +1252,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['s.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['s.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1243,7 +1288,7 @@ class Report extends Base
             $data[] = $value;
         }
 
-        return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $data, 'count' => $count]);
 
     }
 
@@ -1261,7 +1306,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['s.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['s.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1288,7 +1333,7 @@ class Report extends Base
             $data[] = $value;
         }
 
-        if (empty($data)) $data[] = '没有可供导出的数据';
+        if (empty($data)) $data[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($data[0]);
         excelSave('退货流水报表' . date('YmdHis'), $headerArr, $data);
@@ -1313,7 +1358,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['s.is_del', '=', 0], ['gp.exam_status', '=', 6]]; //exam_status==6 上线成功
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.online_time', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];//当上面状态确定为exam_status==6时，上线时间也可以取 updatetime
@@ -1356,7 +1401,7 @@ class Report extends Base
             $data[] = $value;
         }
 
-        return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $data, 'count' => $count]);
 
     }
 
@@ -1376,7 +1421,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['s.is_del', '=', 0], ['gp.exam_status', '=', 6]]; //exam_status==6 上线成功
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.online_time', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1411,7 +1456,7 @@ class Report extends Base
             $data[] = $value;
         }
 
-        if (empty($data)) $data[] = '没有可供导出的数据';
+        if (empty($data)) $data[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($data[0]);
         excelSave('商品上线报表' . date('YmdHis'), $headerArr, $data);
@@ -1436,7 +1481,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['s.is_del', '=', 0], ['gp.exam_status', '=', 8]]; //exam_status==8 下线成功
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.updatetime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1463,7 +1508,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $list, 'count' => $count]);
 
     }
 
@@ -1483,7 +1528,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['s.is_del', '=', 0], ['gp.exam_status', '=', 8]]; //exam_status==8 下线成功
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.updatetime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1505,7 +1550,7 @@ class Report extends Base
             $data[] = $value;
         }
 
-        if (empty($data)) $data[] = '没有可供导出的数据';
+        if (empty($data)) $data[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($data[0]);
         excelSave('商品下线报表' . date('YmdHis'), $headerArr, $data);
@@ -1530,7 +1575,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['cl.type', '=', 3]]; //type==3 商品成本变化记录
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['cl.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1684,7 +1729,7 @@ class Report extends Base
 
         }
 
-        return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $list, 'count' => $count]);
 
     }
 
@@ -1704,7 +1749,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['cl.type', '=', 3]]; //type==3 商品成本变化记录
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['cl.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1866,7 +1911,7 @@ class Report extends Base
 
         }
 
-        if (empty($list)) $list[] = '没有可供导出的数据';
+        if (empty($list)) $list[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($list[0]);
         excelSave('商品修改报表' . date('YmdHis'), $headerArr, $list);
@@ -1910,7 +1955,7 @@ class Report extends Base
          * 'end_date' => 'date'
          * ]);
          *
-         * if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+         * if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
          *
          * //        $where = [['gl.action_type', '=', 'CGD']];
          * //        if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.updatetime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -1930,7 +1975,7 @@ class Report extends Base
          * ->select()
          * ->toArray();
          * halt($list);
-         * if (empty($list)) $list[] = '没有可供导出的数据';
+         * if (empty($list)) $list[] = ['没有可供导出的数据'];
          *
          * $headerArr = array_keys($list[0]);
          * excelSave('出入库明细报表' . date('YmdHis'), $headerArr, $list);
@@ -1955,7 +2000,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['s.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -2023,7 +2068,7 @@ class Report extends Base
             $data[] = $value;
         }
 
-        return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $data, 'count' => $count]);
 
     }
 
@@ -2043,7 +2088,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [['s.is_del', '=', 0]]; //exam_status==6 上线成功
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -2100,7 +2145,7 @@ class Report extends Base
             $data[] = $value;
         }
 
-        if (empty($data)) $data[] = '没有可供导出的数据';
+        if (empty($data)) $data[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($data[0]);
         excelSave('商品信息导出表(基本信息)' . date('YmdHis'), $headerArr, $data);
@@ -2124,7 +2169,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -2152,7 +2197,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $data, 'count' => $count]);
 
     }
 
@@ -2171,7 +2216,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -2189,7 +2234,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        if (empty($data)) $data[] = '没有可供导出的数据';
+        if (empty($data)) $data[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($data[0]);
         excelSave('商品信息导出表(成本)' . date('YmdHis'), $headerArr, $data);
@@ -2213,7 +2258,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -2239,7 +2284,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
+        return json_show(0, '请求成功', ['list' => $data, 'count' => $count]);
 
     }
 
@@ -2258,7 +2303,7 @@ class Report extends Base
             'end_date' => 'date'
         ]);
 
-        if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
+        if (!$val_params->check($param)) return json_show(1004, $val_params->getError());
 
         $where = [];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
@@ -2275,7 +2320,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        if (empty($data)) $data[] = '没有可供导出的数据';
+        if (empty($data)) $data[] = ['没有可供导出的数据'];
 
         $headerArr = array_keys($data[0]);
         excelSave('商品信息导出表(售价)' . date('YmdHis'), $headerArr, $data);