wugg 2 years ago
parent
commit
3cd0af4f77
2 changed files with 4 additions and 3 deletions
  1. 2 1
      app/admin/controller/Exec.php
  2. 2 2
      app/command/Report.php

+ 2 - 1
app/admin/controller/Exec.php

@@ -153,7 +153,8 @@ class Exec extends \app\admin\BaseController{
 			["action"=>"J","name"=>'用友销票表'],
 			["action"=>"K","name"=>'采购单明细表'],
 			["action"=>"M","name"=>'对账单汇总表'],
-			["action"=>"N","name"=>'退货台账']
+			["action"=>"N","name"=>'退货台账'],
+			["action"=>"Q","name"=>'产品部门销售业绩'],
 			];
 		return app_show(0,"获取成功",$ation);
 	}

+ 2 - 2
app/command/Report.php

@@ -887,11 +887,11 @@ class Report extends Command
 		}
 	}
 	//产品部门销售业绩
-	public function Q($param=[]){
+	private function Q($param=[]){
 		$where = [["is_del","=",0],["status","in",[0,1,2]]];
 		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['addtime', 'between', [date("Y-m-d 00:00:00",strtotime($param['start'])),date("Y-m-d 23:59:59",
 		strtotime($param['end']))]];
-		if ($param['companyNo'] != '') $where[] = ['supplierNo', '=', $param['companyNo']];
+//		if ($param['companyNo'] != '') $where[] = ['supplierNo', '=', $param['companyNo']];
 		$Db= Db::connect("mysql_wsm");
 		$list =$Db->name("sale")->field("orderCode 销售单号,apply_name 业务人员,apply_id 业务部门,cat_id 分类,total_price 产品货款总额,addtime 日期")
 		->where($where)